diff --git a/CHANGES.txt b/CHANGES.txt index 0f6dd12ff82..afdebad2f24 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -168,6 +168,8 @@ Release 0.21.0 - Unreleased writes only to a small range of keys (Kannan Muthukkaruppan via Stack) HBASE-2126 Fix build break - ec2 (Kay Kay via JD) + HBASE-2134 Ivy nit regarding checking with latest snapshots (Kay Kay via + Andrew Purtell) IMPROVEMENTS HBASE-1760 Cleanup TODOs in HTable diff --git a/ivy.xml b/ivy.xml index e098516e48e..bd17b17fb78 100644 --- a/ivy.xml +++ b/ivy.xml @@ -79,15 +79,15 @@ + rev="${hadoop-core.version}" conf="common->default" changing="true" > + rev="${hadoop-hdfs.version}" conf="common->default" changing="true" > + rev="${hadoop-mapred.version}" conf="common->default" changing="true" > + rev="${hadoop-core.version}" conf="test->default" transitive="false" changing="true" /> + rev="${hadoop-hdfs.version}" conf="test->default" transitive="false" changing="true" /> + rev="${hadoop-mapred.version}" conf="test->default" transitive="false" changing="true" /> diff --git a/src/contrib/stargate/ivy.xml b/src/contrib/stargate/ivy.xml index b357d4e0bd0..7056b792b4c 100644 --- a/src/contrib/stargate/ivy.xml +++ b/src/contrib/stargate/ivy.xml @@ -88,15 +88,15 @@ rev="${jersey.version}" conf="common->default" /> + rev="${hadoop-core.version}" conf="common->default" changing="true" > + rev="${hadoop-hdfs.version}" conf="common->default" changing="true" > + rev="${hadoop-mapred.version}" conf="common->default" changing="true" > @@ -113,11 +113,11 @@ + rev="${hadoop-core.version}" conf="test->default" transitive="false" changing="true" /> + rev="${hadoop-hdfs.version}" conf="test->default" transitive="false" changing="true" /> + rev="${hadoop-mapred.version}" conf="test->default" transitive="false" changing="true" /> diff --git a/src/contrib/transactional/ivy.xml b/src/contrib/transactional/ivy.xml index 53ea3ac81ce..e8a02d03f24 100644 --- a/src/contrib/transactional/ivy.xml +++ b/src/contrib/transactional/ivy.xml @@ -79,11 +79,11 @@ + rev="${hadoop-core.version}" conf="common->default" changing="true" > + rev="${hadoop-hdfs.version}" conf="common->default" changing="true" > + rev="${hadoop-mapred.version}" conf="test->default" changing="true"/> --> + rev="${hadoop-core.version}" conf="test->default" transitive="false" changing="true" /> + rev="${hadoop-hdfs.version}" conf="test->default" transitive="false" changing="true" />