Fix merge conflicts.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/c7b8c989 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/c7b8c989 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/c7b8c989 Branch: refs/heads/master Commit: c7b8c9896c6def11370077333bf577a3397582ae Parents: 444a5a9 ebaae1f Author: Chris Mattmann <[email protected]> Authored: Thu Oct 12 10:36:49 2017 -0700 Committer: Chris Mattmann <[email protected]> Committed: Thu Oct 12 10:36:49 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 8 ++++++++ core/pom.xml | 25 +++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/c7b8c989/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5abaf3a,5058970..4e50f80 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,11 +1,14 @@@ Apache OODT Change Log ====================== + ++======= + Release 1.3 - In Progress + ++* OODT-964, OODT-963 Fix issues merging Distributed ZK Config module into Avro-RPC branch (imesha,mattmann) + * OODT-957 Add CVE reporting plugin to maven build chain + * OODT-958 Update commons-collections + * OODT-959 Update tika to 1.16 + Release 1.2 - 08/14/2017 * OODT-955 Fix numhits error in Lucene Catalog http://git-wip-us.apache.org/repos/asf/oodt/blob/c7b8c989/core/pom.xml ----------------------------------------------------------------------
