Skip to content

Commit

Permalink
Merging current develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@shoeffner
shoeffner committed Aug 16, 2016
2 parents aab4c11 + f13ce96 commit 34df48f
Show file tree
Hide file tree
Showing 61 changed files with 1,101 additions and 1,427 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ modules/ui/dist
node_modules
modules/ui/app/bower_components
modules/ui/app/scripts/config.js
modules/ui/dist.zip
32 changes: 16 additions & 16 deletions ATTRIBUTIONS/wasabi-analytics-attribution.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2138,7 +2138,7 @@
<name>wasabi-analytics-objects</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-analytics-objects</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-analytics-objects</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2153,7 +2153,7 @@
<name>wasabi-assignment-objects</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-assignment-objects</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-assignment-objects</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2168,7 +2168,7 @@
<name>wasabi-auditlog-objects</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-auditlog-objects</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-auditlog-objects</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2183,7 +2183,7 @@
<name>wasabi-authentication-objects</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-authentication-objects</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-authentication-objects</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2198,7 +2198,7 @@
<name>wasabi-authorization-objects</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-authorization-objects</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-authorization-objects</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2213,7 +2213,7 @@
<name>wasabi-cassandra</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-cassandra</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-cassandra</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2228,7 +2228,7 @@
<name>wasabi-database</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-database</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-database</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2243,7 +2243,7 @@
<name>wasabi-eventlog</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-eventlog</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-eventlog</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2258,7 +2258,7 @@
<name>wasabi-exceptions</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-exceptions</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-exceptions</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2273,7 +2273,7 @@
<name>wasabi-experiment</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-experiment</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-experiment</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2288,7 +2288,7 @@
<name>wasabi-experiment-objects</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-experiment-objects</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-experiment-objects</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2303,7 +2303,7 @@
<name>wasabi-export</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-export</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-export</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2318,7 +2318,7 @@
<name>wasabi-feedback-objects</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-feedback-objects</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-feedback-objects</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2333,7 +2333,7 @@
<name>wasabi-repository</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-repository</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-repository</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2348,7 +2348,7 @@
<name>wasabi-user-directory</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-user-directory</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-user-directory</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -2363,7 +2363,7 @@
<name>wasabi-util</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-util</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-util</projectUrl>
<type>jar</type>
<licenses>
Expand Down
8 changes: 4 additions & 4 deletions ATTRIBUTIONS/wasabi-analytics-objects-attribution.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,7 @@
<name>wasabi-assignment-objects</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-assignment-objects</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-assignment-objects</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -1532,7 +1532,7 @@
<name>wasabi-exceptions</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-exceptions</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-exceptions</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -1547,7 +1547,7 @@
<name>wasabi-experiment-objects</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-experiment-objects</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-experiment-objects</projectUrl>
<type>jar</type>
<licenses>
Expand All @@ -1562,7 +1562,7 @@
<name>wasabi-export</name>
<groupId>com.intuit.wasabi</groupId>
<artifactId>wasabi-export</artifactId>
<version>1.0.20160729011058-SNAPSHOT</version>
<version>1.0.20160801220857-SNAPSHOT</version>
<projectUrl>https://github.com/intuit/wasabi/modules/wasabi-export</projectUrl>
<type>jar</type>
<licenses>
Expand Down
Loading

0 comments on commit 34df48f

Please sign in to comment.