Repository: knox
Updated Branches:
refs/heads/v0.6.0 68db3a30e -> 55de884e1
KNOX-633: Upgrade apache commons-collections
(cherry picked from commit e7736bd8010b20f857685583a8b3fff560430e7a)
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/55de884e
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/55de884e
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/55de884e
Branch: refs/heads/v0.6.0
Commit: 55de884e134bf62b5311a48a14f826eb0102673c
Parents: 68db3a3
Author: Kevin Minder <[email protected]>
Authored: Tue Nov 24 15:28:47 2015 -0500
Committer: Kevin Minder <[email protected]>
Committed: Tue Nov 24 15:31:31 2015 -0500
----------------------------------------------------------------------
CHANGES | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/55de884e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 961f23c..314eeac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ Release Notes - Apache Knox - Version 0.6.1
** Bug
* [KNOX-554] - Fixed support for gateway.path change + added support for
X-Forward-* headers in admin topology API.
+ * [KNOX-633] - Upgrade apache commons-collections
------------------------------------------------------------------------------
Release Notes - Apache Knox - Version 0.6.0
http://git-wip-us.apache.org/repos/asf/knox/blob/55de884e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9b139f0..a79e6fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -874,7 +874,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
