Skip to content

Commit

Permalink
Merge branch 'cassandra-2.2' into cassandra-3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mshuler committed Jun 15, 2017
2 parents 1f54aa4 + 13e153b commit 5b8ae9f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build.properties.default
@@ -1,4 +1,4 @@
# Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus)
artifact.remoteRepository.central: http://repo1.maven.org/maven2
artifact.remoteRepository.apache: https://repository.apache.org/content/repositories/releases
artifact.remoteRepository.apache: http://repo.maven.apache.org/maven2

2 changes: 2 additions & 0 deletions build.xml
Expand Up @@ -238,6 +238,8 @@
<artifact:dependencies pathId="wikitext.classpath">
<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
<remoteRepository refid="central"/>
<remoteRepository refid="apache"/>
</artifact:dependencies>
<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
<wikitext-to-html markupLanguage="Textile">
Expand Down

0 comments on commit 5b8ae9f

Please sign in to comment.