19:05:12 #startmeeting Weekly OVSDB meeting 19:05:12 Meeting started Tue May 20 19:05:12 2014 UTC. The chair is Madhu. Information about MeetBot at http://ci.openstack.org/meetbot.html. 19:05:12 Useful Commands: #action #agreed #help #info #idea #link #topic #startvote. 19:05:12 The meeting name has been set to 'weekly_ovsdb_meeting' 19:05:28 #info networkstatic needs a new headset 19:05:37 #info webex needs to work 19:06:12 #vote Hangout +1 0 -1 19:06:33 +1 19:06:33 still learning ;) 19:06:41 #vote +1 19:06:45 #startvote Hangout +1,0,-1 19:06:45 Unable to parse vote topic and options. 19:07:06 Needs the question mark 19:07:13 Like this: 19:07:19 Hangout? +1,0,-1 19:07:25 #startvote hangout ? +1,0,-1 19:07:25 Begin voting on: hangout ? Valid vote options are +1, 0, -1. 19:07:25 Vote using '#vote OPTION'. Only your last vote counts. 19:07:30 #vote +1 19:07:30 #vote +1 19:09:14 #endvote 19:09:14 Voted on "hangout ?" Results are 19:09:14 +1 (2): tbachman, Madhu 19:09:26 #info Brent is raging ;) 19:10:26 Im a QA guy 19:22:45 #link Floating IP Client Commands http://docs.openstack.org/user-guide/content/floating_ip_allocate.html 19:23:13 did that work? 19:24:06 #info Floating IP Client Commands http://docs.openstack.org/user-guide/content/floating_ip_allocate.html 19:57:46 has anyone seen this errer: 19:57:46 io.netty.handler.codec.TooLongFrameException: frame length exceeds 100000: 100154 - discarded 19:58:01 it's coming from ovsdb 19:58:15 at org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcDecoder.fail(JsonRpcDecoder.java:159) [bundlefile:na] 20:27:06 GiovanniMeo is bamf 21:05:22 brb 22:26:25 when trying to run the mininet with ovsdb we are seeing netty exceptions is OpenDaylight controller 22:26:30 WARN i.n.channel.DefaultChannelPipeline - An exceptionCaught() event was fired, and it reached at the tail of the pipeline. It usually means the last handler in the pipeline did not handle the exception. io.netty.handler.codec.TooLongFrameException: frame length exceeds 100000: 100000 - discarded 22:26:36 has anyone seen this 22:56:48 Hsin-Yi Shen proposed a change to ovsdb: BUG-1056 brocastflow is not proper modified after deleting interface https://git.opendaylight.org/gerrit/7270 23:32:59 Madhu Venugopal proposed a change to ovsdb: Adjusting the ovsdb stable/hydrogen dependencies to appropriate Controller, Yangtools dependencies. https://git.opendaylight.org/gerrit/7273 00:07:18 Madhu Venugopal proposed a change to ovsdb: Fixed typo in PortHandler.java. https://git.opendaylight.org/gerrit/7280 00:09:06 Madhu Venugopal proposed a change to ovsdb: Removed convertNeutronIDToKey(String) calls. https://git.opendaylight.org/gerrit/7281 00:11:00 Madhu Venugopal proposed a change to ovsdb: BUG-954: Add support for Neutron port/network delete events for OF1.3 https://git.opendaylight.org/gerrit/7282 00:59:16 A change was merged to ovsdb: Adjusting the ovsdb stable/hydrogen dependencies to appropriate Controller, Yangtools dependencies. https://git.opendaylight.org/gerrit/7273 01:04:20 A change was merged to ovsdb: Fixed typo in PortHandler.java. https://git.opendaylight.org/gerrit/7280 01:06:54 A change was merged to ovsdb: gitreview: add .gitreivew for stable/hydrogen branch https://git.opendaylight.org/gerrit/7262 01:08:47 A change was merged to ovsdb: Removed convertNeutronIDToKey(String) calls. https://git.opendaylight.org/gerrit/7281 01:11:40 A change was merged to ovsdb: BUG-954: Add support for Neutron port/network delete events for OF1.3 https://git.opendaylight.org/gerrit/7282 01:16:44 networkstatic: thanks boss. 01:16:54 course sir 01:17:11 networkstatic: do u think we shud also cherry pick the IPFIX gerrits ? 01:17:26 we have a couple of them ... if u want we can take them over to stable/hydrogen 01:17:48 i think onlu jimoo was using, whatever u think buddy. 01:18:27 getting my manual QA on now, :) 01:18:54 oh dude. pls don't waste time in doing QA sir :) 01:19:01 lets put effort on IT 01:19:07 and let the Scripts handle it for us 01:19:40 lol, i need a working build to verify stuffs tonight, its good, have ones already. 01:19:56 hey guys how was today's meeting? Hated to miss but I was in my session 01:19:57 btw, u needs to DL Veep 01:20:00 sooo good 01:21:28 networkstatic: of course sir. ur review comments are important. both in gerrit and TV shows ;) 01:21:38 haha 01:21:48 Mierdin: it was a good call. Status updates and my UT/IT talk :) 01:22:00 yes, need a little bit of pleasure in our world of living on laptop 01:22:03 u didn't miss that talk much as I bored u the other day :) 01:22:23 one of us need to blog on the diff of UT/IT/SI 01:22:54 do u watch the shows in ur laptop sir ? 01:22:56 might throw into slides real quick while fresh 01:23:02 nah airplay to tv 01:23:02 I have a kick-ass HTPC at home ;) 01:23:12 ah... fancy 01:23:15 man, i stopped the htpc w/ airplay 01:23:19 no maintenance 01:23:43 mainly cause faster to drag to Beamer 01:23:50 i share app :) 01:23:57 AA :) 01:24:07 u have JB ATV2? 01:24:10 or 3 01:24:34 or even better, mac mini 01:24:40 those are awesome 01:24:47 u know my setup :) 01:24:53 i forgot! lol 01:24:54 i cannot afford to use mac-mini 01:24:56 haha 01:25:02 laptop stuffed behind tv 01:25:03 lol 01:25:12 nahh... 01:25:16 too cheap for mini :) 01:25:19 i know i am 01:25:25 mine need PCIE slots 01:25:30 oh ya. that too ;) 01:25:31 those things hold value on ebay like a champ 01:26:27 ooh new intellij update out 01:27:02 am an eclipse guy :) tried intellij but... somehow it is not clicking 01:27:09 maybe i have to put more time into it 01:28:03 networkstatic: btw.. hope u r following on the email thread on the broadcast multiple output port issue 01:28:13 it is an issue on modify flow operation 01:28:20 and is currently being fixed 01:28:30 pls keep in mind during your manual QA :) 01:28:41 DHCP won't resolve until this issue is merged 01:28:55 networkstatic: fyi : https://git.opendaylight.org/gerrit/#/c/7099/ 01:28:57 i am buddy, i saw that earlier, only thing still broken here 01:29:50 im burned out. going back in the cave for a couple days. sure im wearing out my welcome of asking questions 01:30:07 http://monolingual.sourceforge.net just deleted 3Gb of language packs off mac 01:30:20 more room for VMs 01:33:08 networkstatic: take off sir. we need the crazy networkstatic not the sad one :) 01:34:13 sad faces bad :) 01:42:55 madhu it is not possible for you to bore me 01:43:49 oh and btw just ran into edwarnicke at clus 01:43:55 had a baller chat about helium 01:44:06 introduced me as well 01:44:08 I feel important now 01:44:10 ish 01:44:12 not really... 01:49:58 * edwarnicke waves :) 07:29:11 Hi 13:07:55 Madhu Venugopal proposed a change to ovsdb: Commit operation as per Section 5.2.7 of RFC 7047 https://git.opendaylight.org/gerrit/7297 13:07:56 Madhu Venugopal proposed a change to ovsdb: Fixed a bug in where condition usage in Update & Delete operations. Also moved Delete operation to a seperate transaction in the Test code to test multiple transactions. https://git.opendaylight.org/gerrit/7298 13:18:13 MierdinMobile: hello sir. guess u r busy with #CLUS. Need some help with Mutate. 13:18:19 dave_tucker: hey buddy. 13:18:28 hey Madhu! 13:19:27 the IT that we are writing for operations Insert, delete, etc. will not work until we have Mutate 13:19:39 once Mutate is in place, we will need better Asserts :) 13:20:07 regarding Mutate, I am waiting on Matt to address the comments 13:20:56 Madhu: cool 13:20:57 dave_tucker: just fyi. 13:21:14 also, you need to retrigger the job for 7298 in jenkins 13:22:25 code review now done ;) 13:24:09 also we need to fix this IT - https://jenkins.opendaylight.org/ovsdb/job/ovsdb-verify/org.opendaylight.ovsdb$ovsdb_library/412/testReport/org.opendaylight.ovsdb.lib.jsonrpc/TestClient/testBasicFlow/ 13:24:25 as it's a pain in the ass that builds are being marked unstable because of this 13:25:22 oh and I retriggered the build in jenkins for you while I was there 13:25:38 Madhu Venugopal proposed a change to ovsdb: Abort operation as per Section 5.2.8 of RFC 7047 https://git.opendaylight.org/gerrit/7300 13:25:59 thanks sir 13:26:09 your +1s are useful :) 13:26:17 will ask Brent/Ashwin to merge it 13:26:36 i don't want to +2 my own commits :) 13:27:18 dave_tucker: sure. i will take a look @ the basic flow error 13:27:37 brb sir 13:27:38 just need to catch the exception and use a different port 13:27:40 ;) 13:27:52 lets use a different port for this IT period :) 13:28:10 lol. issue is only present when 2 jobs are building at the same time 13:29:00 ya. i mean pick ports randomly between 6640 - 6740 ;) 13:29:11 but then we might have a coliision 13:29:18 so still need logic to handle that ;) 13:29:19 brb sir. 13:29:21 k 13:36:22 when you are back we should chat about my commit you have -1'd :p 13:36:49 am back. :) but before chatting about that, i want to quickly get your opinion on Mutate 13:37:01 we both commented on Matt's Mutate diffs 13:37:23 but since we need that to do proper IT, I am inclined on merging them first and then I will update the tests with mutate operation in place. 13:37:35 Madhu: that works for me 13:37:37 I don't want to get blocked by the absence of Mutate. 13:37:41 okay. lemme merge them now. 13:37:57 waiting for maven before I add the IT for select fyi 13:37:58 now... lets talk about the static table name issue. 13:38:02 yeah :p 13:38:25 so my point is, it doesn't matter.... the constants are a convenience function and you can use them, or not 13:38:38 my point is 13:38:46 but based on the fact that everybody will be defining the same basic set of constants, makes sense to have them in library 13:38:49 the moment you declare it.. it gets first class citizen 13:39:13 I don't want the Table names to get that privilege in the library 13:39:44 We had this extensive discussion and intact am opposed to even having the database name OpenVSwitch given that first class citizen role in the library 13:39:59 well I think we should add the VTEP stuff too 13:40:03 and i also changed that code (will get it out of my stash and push it) 13:40:20 even if it's just to a class full of constants in utils 13:40:24 or something ;) 13:40:35 not in library :) 13:40:40 lemme put it this way 13:40:41 the library itself doesn't care - it just wants a string 13:40:51 if u c it in RFC7047, it gets into library :) 13:41:17 if u don't see it in the RFC, library should not give it a preference. 13:41:30 ashw7n: my man. :) 13:41:35 lol 13:41:47 we are stalkers ;) 13:41:53 dave_tucker: back to the topic 13:42:08 we made the mistake during the Hydrogen release by mixing library and plugin 13:42:13 appreciate your view Madhu. but as a developer, I like convenience.... and it makes it hard to use the library if I have to read the OVSDB schema to get the table names ;) 13:42:35 dave_tucker: that problem will be solved :) once we have plugin operating on Library 13:42:43 + DRY principle. we will have multiple defintions of the same constants 13:42:57 no. we will not :) 13:43:01 ok cool 13:43:06 lemme explain it other way 13:43:12 then in that case I'll abandon and we move this to the plugin 13:43:28 the tests that we are adding to the library now are "temporary" 13:43:31 once plugin is in place 13:43:44 lets get crazy there :) and use these constants and intact I would recommend static typing there 13:43:56 lets also introduce first class tables as classes on the plugin layer 13:44:00 Madhu: I'm not keen on static typing ;) 13:44:01 and add all the nice test-cases there 13:44:17 but we should DEFINATELY have IT/UT in the library 13:44:18 library should be kept clean. IMHO 13:44:39 and that should include the tests we have today (but with more assertions) 13:44:40 ;) 13:44:42 the UT/IT in library should be completely RFC7047 dependent :) 13:45:00 dave_tucker: +10000 on assertions 13:45:02 Madhu: yessir, but you have to test against an implementation 13:45:25 dave_tucker: can u imagine the world am trying to try in the library ? :) 13:45:35 we can use list_dbs :) to get all the databases supported 13:45:48 Madhu: ok yeah that makes sense 13:45:50 and then we can do getSchema to get all the tables and columns in that 13:45:54 with these 2 info 13:46:05 we can test all the tables and individual columns from library 13:46:19 without needing to have a string like "bridge" or "Interface" defined in the Test classes :) 13:46:21 but to do CRUD, we need to understand the schema though 13:46:27 i think 13:46:36 yep. CRUD needs it. but that is in the Northbound layer 13:46:58 well, ok I mean Select + Insert + Update + Delete 13:47:00 but even there :) if we expose the getSchema and list_dbs (which we will) 13:47:13 even Select +insert + update + delete 13:47:20 can be done entirely schema independent 13:47:33 just by getting the info using list_dbs and getSchema :) 13:47:42 because everything u need to know is in there 13:47:46 yeah I guess we just need some test data that matches the expected types as per the RFC 13:47:50 tableName, Column Name, Column Type. etc... 13:48:23 so IMO, library tests should not even have the string "bridge" represented there 13:48:32 Madhu: fair enough sir 13:48:33 we are adding such tests now just to make progress. 13:48:46 once we are in stable grounds all these tests should move to plugin 13:48:51 yeah I know... your reasoning is correct, as always :p 13:48:55 and we will live in a pure Library world :) 13:49:00 lol 13:49:14 where everything is abstract 13:49:21 since Ben & Justin are happy to have this library as ref impl in OVS 13:49:30 its better to be abstract and scalable to any schema 13:49:37 and folks just pick it up and use it :) 13:50:01 dave_tucker: sorry for being religious on this topic. 13:50:10 just trying to avoid the same mistakes that we did for Hydrogen 13:50:40 whenever i see these static values (even in tests), i don't feel comfortable 13:50:42 Madhu: it's fine sir. I was looking at use of the library forgetting that we needed to support multiple schemas. totally makes sense now we've spoken about it 13:50:51 but being practical, am just trying to make sure we make progress too 13:51:00 excellent buddy. 13:51:37 intact once all the operations are done, my plan is to write the abstract and generic test-case 13:51:49 which will ram through all the tables/columns and operations 13:52:07 without the need to have any static typing or strings :) 13:52:11 but that is a lot of work 13:52:40 Dave Tucker proposed a change to ovsdb: Add OVSDB Select Operation https://git.opendaylight.org/gerrit/6861 13:52:53 thanks odp-gerritbot 13:53:02 included your fix for the where's too Madhu 13:53:09 as well as the IT 13:53:15 thanks sir. 13:57:32 Dave Tucker proposed a change to ovsdb: Unit Test Coverage for OvsdbClientImpl https://git.opendaylight.org/gerrit/7122 13:57:45 and that one was rebased and addressed sam's comments 13:58:33 omg networkstatic_ finally cloned himself - networkstatic_zZ 13:58:49 that's too much awesome for one channel 14:01:04 lol 14:01:07 networkstatic_: u there sir ? 14:04:11 Dave Tucker proposed a change to ovsdb: Update .gitreview to use topic/schema branch https://git.opendaylight.org/gerrit/7303 14:04:12 networkstatic: hey buddy 14:16:07 Madhu: ref https://git.opendaylight.org/gerrit/7122 - do u know if we could s/Integration/IT/g with the name of the base class without confusing Maven? 14:18:11 also Madhu we can't merge that until https://git.opendaylight.org/gerrit/#/c/7121/ merges 14:18:47 when writing the UT I noticed that isReady is always true... the timeout in the todo is therefore pointless 14:21:26 "return null != schema;" is always true. Because we init schema when the class is instantiated. 14:21:48 a better check is to see if the list of schemas > 0, which is what was added in 7121 14:30:25 Madhu: if you are still there sir... re-read your comments... would you be happy with this https://gist.github.com/878b3de25df043afbc38 for the timeout 14:36:35 now using isEmpty instead of size - https://gist.github.com/f2beecf462f15eaff1fb 14:41:35 Dave Tucker proposed a change to ovsdb: Stop isReady method always returning true https://git.opendaylight.org/gerrit/7121 14:47:36 Dave Tucker proposed a change to ovsdb: Stop isReady method always returning true https://git.opendaylight.org/gerrit/7121 14:49:03 dave_tucker: hey buddy. 7am+ is challenging :) 14:49:18 be back online in 1 hr. will continue reviewing / merge the code sir 14:52:56 oops. sorry bro forgot it was 7am 16:03:54 Hey Madhu 16:03:59 read some of the chat on my phone 16:04:02 saw you guys were asking about Mutate 16:04:10 Mierdin: hi buddy 16:04:23 I'm not holding you guys up on anything, right? I can take a break from this and make a change if you're waiting on something 16:04:26 yes sir. Mutate is an important operation for us to write proper IT 16:04:43 agreed 16:04:50 it would be awesome if you can get the Mutate pushed 16:05:20 I was inclined to merge the code as is 16:05:34 but I have a few comments and wanted to talk to u first. 16:06:20 I noticed you commented on the commit I assume that's what you'd like me to fix 16:06:39 there is 1 more thing 16:07:23 Mierdin: i was reviewing the value() method : count = (Integer) value; //TODO: Verify this is the right thing to do. Fairly sure from re- 16:07:23 reading RFC but want to make sure. 16:07:57 the "count" member belongs to the result object. 16:08:28 also. a value() method doesn't apply for mutate operation 16:09:12 As we discussed, it is similar to update() but carries specific mutations 16:10:16 ehi guys, 16:10:22 i need some help with ovsdb 16:10:30 gotcha. So not needed? I assumed it needed to be there since the RFC says it returns a "count" object just like Update 16:10:41 i'm trying to rune the autorelease to release ovsdb project 16:10:43 GiovanniMeo: sure 16:10:45 but i noticed 16:10:46 Madhu: And it's good to hear that you'd prefer me to bind the Operations changes with the Mutate changes. I wasn't sure if that was the right way to do it but makes sense now that they should be together, given their relationship 16:10:49 this dependency 16:10:52 org.opendaylight.integration:distributions-virtualization:zip:osgipackage:0.1.2-SNAPSHOT:provided 16:11:11 so this is causing a circular dependency in the release 16:11:21 because ovsdb need the integration 16:11:26 and the integration needs ovsdb 16:11:32 Mierdin: right. typically i prefer smaller commits. but this specific one 16:11:52 Mierdin is hard to catch the issue unless it is in the package of the 3 things (which includes the Test coverage) :) 16:12:09 GiovanniMeo: correct :) 16:12:13 so ? 16:12:14 so i wonder 16:12:34 what you need the distribution for 16:12:36 in here 16:12:37 Madhu: :) test coverage was the next change that I was working on. 16:12:53 so we can see if we can break the circle 16:12:55 somehow 16:13:18 Mierdin: perfect. i don't want to act like an ass... but we are trying to be more organized this time around :) 16:13:38 GiovanniMeo: distribution here is like the same reason all other project has 16:13:49 Madhu: no, not at all! It's like I said, I want to make sure that my contributions are done the right way 16:13:53 for testing OVSDB with their dependent bundles 16:14:20 Mierdin: there is nothing wrong in not adding the tests in the commit (for the master branch and Hydrogen release) :) 16:14:37 GiovanniMeo: this issue is NOT specific to ovsdb I believe 16:14:55 all the other depends on the controller distro 16:14:59 GiovanniMeo: all other projects does the same... they have a distribution which pulls in the dependencies and then builds on their own 16:15:04 not on one from integration 16:15:07 GiovanniMeo: fair enough :) 16:15:18 Madhu: okay so I need to head over to Moscone, but can make the changes. In summary, I need to remove that method entirely, and also merge the change to Operations.java with the addition of Mutate.java. Correct? 16:15:24 I was lazy because we depend on controller and open flow plugin projects 16:15:27 Madhu: I can follow up once out of here with proper UT/IT 16:15:31 so if we build the distro in here 16:15:37 starting from controller base 16:15:43 would you see any issue with that? 16:15:45 Mierdin: thanks 16:16:06 or if we create a distro 16:16:08 GiovanniMeo: not a problem. But we also need the openflowplugin and openflowjava pulled in as well 16:16:29 the trouble we are facing is the version compatibility :( 16:16:39 sure that means ovsdb will be released after openflowplugin and openflowjava 16:16:50 as u know it is all interlinked and that is the reason i made it simple by pulling in the virt edition from integration branch 16:16:51 just looking to break the circular dependency 16:16:55 i will propose a patch 16:17:02 based on this 16:17:04 thx Madhu 16:17:50 sure GiovanniMeo . thanks. 17:16:11 Hsin-Yi Shen proposed a change to ovsdb: BUG-1056 brocastflow is not proper modified after deleting interface https://git.opendaylight.org/gerrit/7270 17:40:14 hello! can someone give me some lights finding how to disable the module that enables reactive forwarding in opendaylight? I've been using the ovsdb nb api to set up some flows, but some of them are overridden by reactive flows 17:42:38 I think it's simple forwarding 17:44:04 A change was merged to ovsdb: Cleaned up Integration Test setup https://git.opendaylight.org/gerrit/7233 17:44:20 CASP3R: thank you. I'll try it out. By that the way, is there any way for disabling a bundle automatically in odl? 17:44:44 Not off the top of my head 17:45:17 ss simple 17:45:35 you can just delete the simpleforwarding jar buddy 17:45:51 from the /plugins directory 17:46:02 yea i know we do that when doing performance testing but didn't know if there a "better' way to do it 17:46:39 ah roger, proper! 17:46:52 it shouldnt be bundled in the next integration releases 17:47:05 enough complained when it was in hydriogen 17:47:24 networkstatic: so right now I could just just remove it from there and put it back in case I need it 17:50:39 A change was merged to ovsdb: Fixed a bug in where condition usage in Update & Delete operations. Also moved Delete operation to a seperate transaction in the Test code to test multiple transactions. https://git.opendaylight.org/gerrit/7298 17:50:40 A change was merged to ovsdb: Commit operation as per Section 5.2.7 of RFC 7047 https://git.opendaylight.org/gerrit/7297 17:52:55 A change was merged to ovsdb: Abort operation as per Section 5.2.8 of RFC 7047 https://git.opendaylight.org/gerrit/7300 17:53:28 yessir rrsantos 17:53:35 ss gives you all of the running modeuls 17:53:37 modules 17:53:46 from the OSGI cli 17:54:22 then u can stop and start based on the PID 17:54:33 number of the module process in the output 17:54:38 stop or start etc 17:54:44 with the number 17:55:34 networkstatic: yes, it is working now. by the way, should I need to set up a rule for sending arp requests to the controller after I disable the simple forwarding? 17:55:55 ah ARP lol, thats a toughy 17:56:26 I need to look at what if anything has been done with arp tracker 17:56:26 hosttracker 17:56:36 doesn;t the ARPhandler do that? 17:56:38 darn, evan isnt on 17:56:50 roger, simple forwarding loads that 17:57:16 i know evan had been working on L2switch 17:57:22 i am just not sure 17:57:33 we use openstak/ovsdb for ARP 17:57:41 or to not need arp :) 17:57:58 the beauty of openstack for networking 17:58:26 much harder problem discovering w/o orchestration 17:59:14 rrsantos: soon as colin dixon or evan are on we can sync u up 18:00:27 networkstatic: thank you :) so a possible solution for handling arp requests after disabling simpleforwarding would be using openstack? 18:01:46 if u want to give openstack a run here are instructions buddy http://networkstatic.net/updated-devstack-opendaylight-vm-image-for-openstack-icehouse/ 18:01:55 and a nwe image 18:04:34 I should give it a try 18:05:03 I've been reading so much things about openstack but never tried it though 18:10:30 odp-gerritbot: wakeup... 18:10:37 ha 18:10:42 dont u snap at odl_meetbot 18:10:48 he will cut you 18:11:08 fiesty little bugger 18:11:45 he is partying too much. 18:11:50 rofl 18:12:44 Dave Tucker proposed a change to ovsdb: Update .gitreview to use topic/schema branch https://git.opendaylight.org/gerrit/7303 18:13:32 Dave Tucker proposed a change to ovsdb: Stop isReady method always returning true https://git.opendaylight.org/gerrit/7121 18:25:36 Madhu: how do you suggest I merge the two commits? 18:27:12 Mierdin: copy/paste and abandon the other? 18:27:30 you could dance with cherry-pick and rebase but it might get confusing quickly 18:30:46 yeah I've done rebase before and know it's not my first choice :) 18:31:18 evanz_: hey bud, you guys done anything significant with the L2Switch yet? If so can u dump usage for rrsantos ? 18:34:05 networkstatic: not as far as I am aware 18:34:32 rogr 18:34:35 the cisco guys are doing cisco live this week, should get more active after that 18:34:57 rrsantos: looks like simpleforwarding is the out of the box for now buddy 18:35:17 aye 18:35:19 it basically proxies ARP and does an L3 rewrite 18:35:39 kinda expensive but does scale beyond L2 segments 18:37:47 dave_tucker: so the changes are already committed locally 18:37:54 this is gonna sound stupid 18:37:55 but... 18:38:14 Mierdin: there are no stupid questions...unless its from you. 18:38:21 i can say something dumber if it makes u feel better 18:38:24 I can maybe undo the Operations changes, commit, then recreate them with a new commit that appends to the commit containing the new Mutate file? 18:38:32 bigmstone: ass 18:38:38 If it's in the same branch.... 18:38:48 you can git reset to the change id of your first commit 18:38:54