Permalink
Commits on Sep 1, 2014
Commits on Aug 29, 2014
Commits on Aug 28, 2014
  1. Merge branch '3.x'

    Paras Lakhani
    Paras Lakhani committed Aug 28, 2014
    Conflicts resolved using master version:
    	grails-datastore-gorm-cassandra/build.gradle
    	grails-datastore-gorm-cassandra/src/main/groovy/org/grails/datastore/gorm/cassandra/bean/factory/CassandraMappingContextFactoryBean.groovy
    	grails-datastore-gorm-cassandra/src/test/groovy/org/grails/datastore/gorm/cassandra/plugin/support/CassandraSpringConfigurerSpec.groovy
    	grails-plugins/cassandra/grails-app/conf/BuildConfig.groovy
  2. Merge branch '3.x'

    lhotari committed Aug 28, 2014
  3. Merge branch '3.x'

    lhotari committed Aug 28, 2014
    Conflicts:
    	build.gradle
  4. use https to repo.grails.org

    lhotari committed Aug 28, 2014
  5. Merge branch '3.x'

    lhotari committed Aug 28, 2014
Commits on Aug 27, 2014
  1. fix failing test

    jeffbrown committed Aug 27, 2014
  2. Merge branch '3.x'

    lhotari committed Aug 27, 2014
  3. fix compilation errors

    graemerocher committed Aug 27, 2014
  4. fix failing tests

    graemerocher committed Aug 27, 2014
  5. fix failing tests

    graemerocher committed Aug 27, 2014
  6. Merge branch '3.x'

    lhotari committed Aug 27, 2014
    Conflicts:
    	build.gradle