sentry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject [2/2] git commit: Merge remote branch 'origin/master' into db_policy_store
Date Wed, 05 Mar 2014 13:42:55 GMT
Merge remote branch 'origin/master' into db_policy_store


Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/62b22be9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/62b22be9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/62b22be9

Branch: refs/heads/db_policy_store
Commit: 62b22be9c667b0ba5c600904a974faa865b79b1d
Parents: 92212c3 77554a0
Author: Brock Noland <brock@apache.org>
Authored: Wed Mar 5 07:13:56 2014 -0600
Committer: Brock Noland <brock@apache.org>
Committed: Wed Mar 5 07:13:56 2014 -0600

----------------------------------------------------------------------
 pom.xml                                               | 14 ++++++++++++--
 .../tests/e2e/solr/AbstractSolrSentryTestBase.java    |  2 +-
 .../e2e/solr/ModifiableUserAuthenticationFilter.java  |  3 +--
 .../tests/e2e/solr/TestCollAdminCoreOperations.java   |  5 +++++
 .../sentry/tests/e2e/solr/TestQueryOperations.java    |  5 +++++
 .../sentry/tests/e2e/solr/TestUpdateOperations.java   |  5 +++++
 .../src/test/resources/solr/solr-no-core.xml          |  3 +++
 7 files changed, 32 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/62b22be9/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index ee10c07,5a8c32b..9725102
--- a/pom.xml
+++ b/pom.xml
@@@ -74,10 -72,10 +74,11 @@@ limitations under the License
      <libthrift.version>0.9.0-cdh4-1</libthrift.version>
      <libfb303.version>0.9.0</libfb303.version>
      <log4j.version>1.2.16</log4j.version>
 +    <mockito.version>1.8.5</mockito.version>
      <shiro.version>1.2.1</shiro.version>
      <slf4j.version>1.6.1</slf4j.version>
-     <solr.version>4.4.0-cdh5.0.0-beta-2-SNAPSHOT</solr.version>
+     <solr.version>4.7.0</solr.version>
+     <solr.sentry.handlers.version>4.4.0-cdh5.0.0-beta-2-SNAPSHOT</solr.sentry.handlers.version>
      <zookeeper.version>3.4.5-cdh5.0.0-beta-2-SNAPSHOT</zookeeper.version>
    </properties>
  

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/62b22be9/sentry-tests/sentry-tests-solr/src/test/java/org/apache/sentry/tests/e2e/solr/AbstractSolrSentryTestBase.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/62b22be9/sentry-tests/sentry-tests-solr/src/test/java/org/apache/sentry/tests/e2e/solr/ModifiableUserAuthenticationFilter.java
----------------------------------------------------------------------
diff --cc sentry-tests/sentry-tests-solr/src/test/java/org/apache/sentry/tests/e2e/solr/ModifiableUserAuthenticationFilter.java
index 8df4ba3,b61ee25..533858b
--- a/sentry-tests/sentry-tests-solr/src/test/java/org/apache/sentry/tests/e2e/solr/ModifiableUserAuthenticationFilter.java
+++ b/sentry-tests/sentry-tests-solr/src/test/java/org/apache/sentry/tests/e2e/solr/ModifiableUserAuthenticationFilter.java
@@@ -26,8 -26,8 +26,7 @@@ import javax.servlet.ServletRequest
  import javax.servlet.ServletResponse;
  import javax.servlet.http.HttpServletRequest;
  
- import org.apache.solr.servlet.SolrHadoopAuthenticationFilter;
  import org.apache.solr.servlet.SolrRequestParsers;
 -
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/62b22be9/sentry-tests/sentry-tests-solr/src/test/java/org/apache/sentry/tests/e2e/solr/TestCollAdminCoreOperations.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/62b22be9/sentry-tests/sentry-tests-solr/src/test/java/org/apache/sentry/tests/e2e/solr/TestQueryOperations.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/62b22be9/sentry-tests/sentry-tests-solr/src/test/java/org/apache/sentry/tests/e2e/solr/TestUpdateOperations.java
----------------------------------------------------------------------


Mime
View raw message