{"push_id":607627896,"size":10,"distinct_size":10,"ref":"refs/heads/master","head":"d5931f81444c74998d4a94f675190e67d4d61fb1","before":"35a7a8ed39e86a5b6cd77a46e6eb7e7a48ec6178","commits":[{"sha":"a83e1d3b6c70dd35f9180bbdbcfef17f4b568350","author":{"email":"8b7eedf75512437d359cd62017cf5724393a1b14@ycp.edu","name":"Shane Bonner"},"message":"pulled from josh","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/a83e1d3b6c70dd35f9180bbdbcfef17f4b568350"},{"sha":"a923c8db2cebca6ba69c4d1203f47431492cab73","author":{"email":"8b7eedf75512437d359cd62017cf5724393a1b14@ycp.edu","name":"Shane Bonner"},"message":"changed the database files to be able to use addLiquor and addBeer, instead of trying to do the actions in the addDrink section. I also changed getDrinkList to return a list of drink objects instead of a list of strings containing the names.","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/a923c8db2cebca6ba69c4d1203f47431492cab73"},{"sha":"754391688a6b264570c1bf97e0b5af84222c8b4c","author":{"email":"8b7eedf75512437d359cd62017cf5724393a1b14@ycp.edu","name":"Shane Bonner"},"message":"trying to fix persistence error in the database","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/754391688a6b264570c1bf97e0b5af84222c8b4c"},{"sha":"e3dc811b3e7ff08c04e1ca470fae1cdbe54f4eb4","author":{"email":"c639b007e4f783d6ff568dc1fd89150228cf278c@ycp.edu","name":"jcoady9"},"message":"minor changes","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/e3dc811b3e7ff08c04e1ca470fae1cdbe54f4eb4"},{"sha":"efbdc7c73d27dc618900eb1a14c6595cc18cf68a","author":{"email":"c639b007e4f783d6ff568dc1fd89150228cf278c@ycp.edu","name":"jcoady9"},"message":"Merge branch 'master' of https://github.com/sbonner1/RateMyDrink","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/efbdc7c73d27dc618900eb1a14c6595cc18cf68a"},{"sha":"b3a92a3ef0493b5de49d0c68cc132b9c38c3cff5","author":{"email":"c639b007e4f783d6ff568dc1fd89150228cf278c@ycp.edu","name":"jcoady9"},"message":"fixed NullPointerException error when adding a new Beer","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/b3a92a3ef0493b5de49d0c68cc132b9c38c3cff5"},{"sha":"857a018eb45a762a8770d630e50bb29484436429","author":{"email":"8b7eedf75512437d359cd62017cf5724393a1b14@ycp.edu","name":"Shane Bonner"},"message":"pulled from josh","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/857a018eb45a762a8770d630e50bb29484436429"},{"sha":"a205310f8bfd431cb0a96754bbe98afde799e139","author":{"email":"8b7eedf75512437d359cd62017cf5724393a1b14@ycp.edu","name":"Shane Bonner"},"message":"commit before merging with josh","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/a205310f8bfd431cb0a96754bbe98afde799e139"},{"sha":"d407dc3f1fdec11529c2e2f3ced211643ec00c8c","author":{"email":"8b7eedf75512437d359cd62017cf5724393a1b14@ycp.edu","name":"Shane Bonner"},"message":"merged with josh, correctly this time. added some more changes to prevent null pointer exceptions from the database","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/d407dc3f1fdec11529c2e2f3ced211643ec00c8c"},{"sha":"d5931f81444c74998d4a94f675190e67d4d61fb1","author":{"email":"df1147cbbc82c5b32f0642c78b4fe9a1a9e35fba@ycp.edu","name":"aroth4"},"message":"Merge branch 'master' of https://github.com/sbonner1/RateMyDrink\n\nConflicts:\n\tbackend/build/classes/main/persist/DerbyDatabase.class\n\tbackend/build/libs/backend.war\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/classes/persist/DerbyDatabase.class\n\tbackend/build/tmp/jettyRunWar/webapp/WEB-INF/lib/modelclasses.jar\n\tmodelclasses/build/libs/modelclasses.jar\n\tmodelclasses/src/main/java/com/rateMyDrink/modelClasses/Beer.java","distinct":true,"url":"https://api.github.com/repos/aroth4/RateMyDrink/commits/d5931f81444c74998d4a94f675190e67d4d61fb1"}]}