diff --git a/CHANGES b/CHANGES index 486283869a..afcb361161 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.4 | 2015-06-08 13:27:18 -0700 + + * Release 2.4. + 2.4-beta-42 | 2015-06-08 09:41:39 -0700 * Fix reporter errors with GridFTP traffic. (Robin Sommer) diff --git a/VERSION b/VERSION index 2b4a13c041..6b4950e3de 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-beta-42 +2.4 diff --git a/aux/bro-aux b/aux/bro-aux index 063a109ccf..6d6679506d 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit 063a109ccf9f1a2bf88808dec119679b3e33edf4 +Subproject commit 6d6679506d8762ddbba16f0b34f7ad253e3aac45 diff --git a/aux/broctl b/aux/broctl index 27109473ff..230a60bef8 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 27109473ffc83e9a28e5baeddac15b70e0dfda9d +Subproject commit 230a60bef8fca1aec379cf862663570d366302f0 diff --git a/aux/broker b/aux/broker index 8fc6938017..441fabed0f 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit 8fc6938017dc15acfb26fa29e6ad0933019781c5 +Subproject commit 441fabed0fba6d47456ba18ccbe8aaed30dbcfd1 diff --git a/aux/plugins b/aux/plugins index 64f85b5086..99d7519991 160000 --- a/aux/plugins +++ b/aux/plugins @@ -1 +1 @@ -Subproject commit 64f85b5086fe9feb4cbcaaa8712db61e709836d3 +Subproject commit 99d7519991b41a970809a99433ea9c7df42e9d93