SHOW:
|
|
- or go back to the newest paste.
| 1 | - | commit 0dd4d72943f2cb1d3923d7696ec3456dffe66662 |
| 1 | + | Change-Id: I485810dc49504e9cad9cd50c34f552c22579cf11 |
| 2 | - | Author: Neel <neel250294@gmail.com> |
| 2 | + | Signed-off-by: Neel <neel250294@gmail.com> |
| 3 | - | Date: Fri Aug 22 21:38:20 2014 +0530 |
| 3 | + | |
| 4 | Signed-off-by: Neel <neel250294@gmail.com> | |
| 5 | - | Change-Id: I485810dc49504e9cad9cd50c34f552c22579cf11 |
| 5 | + | |
| 6 | - | Signed-off-by: Neel <neel250294@gmail.com> |
| 6 | + | # Please enter the commit message for your changes. Lines starting |
| 7 | - | |
| 7 | + | # with '#' will be ignored, and an empty message aborts the commit. |
| 8 | - | Signed-off-by: Neel <neel250294@gmail.com> |
| 8 | + | # On branch master |
| 9 | # Your branch and 'origin/master' have diverged, | |
| 10 | - | commit f0f107f9b889b728be457cf84289b53386d7d301 |
| 10 | + | # and have 1 and 2 different commits each, respectively. |
| 11 | - | Merge: aa83d1e 88ba79b |
| 11 | + | # (use "git pull" to merge the remote branch into yours) |
| 12 | - | Author: Ed Warnicke <eaw@cisco.com> |
| 12 | + | # |
| 13 | - | Date: Thu Aug 21 14:37:01 2014 +0000 |
| 13 | + | # Changes to be committed: |
| 14 | # modified: opendaylight/md-sal/pom.xml | |
| 15 | - | Merge "Converted Inventory Manager to use Transaction Chaining" |
| 15 | + | # modified: opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfDocumentedException.java |
| 16 | # new file: opendaylight/md-sal/sal-xpath-it/pom.xml | |
| 17 | - | commit aa83d1e4b013eecde3c79b00cca538bd4763c2d4 |
| 17 | + | # new file: opendaylight/md-sal/sal-xpath-it/src/test/java/org/opendaylight/controller/md/sal/xpath/it/ToasterTest.java |
| 18 | - | Merge: d0bf270 01695de |
| 18 | + | # new file: opendaylight/md-sal/sal-xpath-it/src/test/resources/controller.xml |
| 19 | - | Author: Ed Warnicke <eaw@cisco.com> |
| 19 | + | # new file: opendaylight/md-sal/sal-xpath-it/src/test/resources/listtoaster.xml |
| 20 | - | Date: Thu Aug 21 14:26:58 2014 +0000 |
| 20 | + | # new file: opendaylight/md-sal/sal-xpath-it/src/test/resources/logback.xml |
| 21 | # new file: opendaylight/md-sal/sal-xpath-it/src/test/resources/nestedtoaster.xml | |
| 22 | - | Merge "Fixed possible NPE in flow reconciliation" |
| 22 | + | # new file: opendaylight/md-sal/sal-xpath-it/src/test/resources/nestedtoaster.yang |
| 23 | # new file: opendaylight/md-sal/sal-xpath-it/src/test/resources/toaster.xml | |
| 24 | - | commit d0bf270d0493c04ac2e9e4a9f7de56e5b65a4ef2 |
| 24 | + | # new file: opendaylight/md-sal/sal-xpath-it/src/test/resources/toasterwithlist.yang |
| 25 | - | Merge: 51e91f6 2ec3dd0 |
| 25 | + | # new file: opendaylight/md-sal/sal-xpath/pom.xml |
| 26 | - | Author: Ed Warnicke <eaw@cisco.com> |
| 26 | + | # new file: opendaylight/md-sal/sal-xpath/src/main/java/org/opendaylight/controller/md/sal/xpath/NamedNodeMapImpl.java |
| 27 | - | Date: Thu Aug 21 10:57:14 2014 +0000 |
| 27 | + | # new file: opendaylight/md-sal/sal-xpath/src/main/java/org/opendaylight/controller/md/sal/xpath/NewElement.java |
| 28 | # new file: opendaylight/md-sal/sal-xpath/src/main/java/org/opendaylight/controller/md/sal/xpath/NodeBuilderElement.java | |
| 29 | - | Merge "Bug 1585 - switch features removed after node updated" |
| 29 | + | # new file: opendaylight/md-sal/sal-xpath/src/main/java/org/opendaylight/controller/md/sal/xpath/NodeBuilderText.java |
| 30 | # new file: opendaylight/md-sal/sal-xpath/src/main/java/org/opendaylight/controller/md/sal/xpath/ThrowExceptionNode.java | |
| 31 | - | commit 51e91f6bdcc88c5aa96f956e516d31dbb5e5d5e0 |
| 31 | + | # new file: opendaylight/md-sal/sal-xpath/src/main/java/org/opendaylight/controller/md/sal/xpath/ThrowExceptionText.java |
| 32 | - | Merge: 11c04a3 74561c3 |
| 32 | + | # |
| 33 | - | Author: Tony Tkacik <ttkacik@cisco.com> |
| 33 | + | # Changes not staged for commit: |
| 34 | - | Date: Thu Aug 21 09:58:22 2014 +0000 |
| 34 | + | [ Read 40 lines ] |
| 35 | ^G Get Help ^O WriteOut ^R Read File ^Y Prev Page ^K Cut Text ^C Cur Pos | |
| 36 | - | Merge "Revert "Revert "BUG-1425: Integrated new Binding to Normalized Node codec for write path""" |
| 36 | + | ^X Exit ^J Justify ^W Where Is ^V Next Page ^U UnCut Text ^T To Spell |
