Commit graph

1401 commits

Author SHA1 Message Date
Mike Duff
9556ed337a Issue #1589 - Fix saving of custom subset areas in spatial subset tab
Change-Id: I4143de4c3ab78a6da4de407d9035e70e264fe95a

Former-commit-id: 9dfaee98a1 [formerly 4c47ee820d] [formerly 1511490c55] [formerly f845137930 [formerly 1511490c55 [formerly 09e0a2450e8e1c860ae3e8d6354320cc0b2b6d88]]]
Former-commit-id: f845137930
Former-commit-id: c5cf862b37d59c7a0d7c772771e98991dc35ae40 [formerly 7fcd553333]
Former-commit-id: de3d5aec9a
2013-02-20 14:57:58 -06:00
Nate Jensen
04a141d30f Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb

Former-commit-id: 376a966852 [formerly e0884ed550] [formerly c2d4f8e164] [formerly e6e2d8905c [formerly c2d4f8e164 [formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]]
Former-commit-id: e6e2d8905c
Former-commit-id: 7a4a9a6467cfdc2321c93cb906bc1f8119346908 [formerly a7b74e1f79]
Former-commit-id: f5a1165062
2013-02-20 13:48:26 -06:00
Ron Anderson
c0364ee665 Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
Former-commit-id: 9c2caa95a0 [formerly 70050ac749] [formerly f1ad632c3f] [formerly 884d9ff787 [formerly f1ad632c3f [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]
Former-commit-id: 884d9ff787
Former-commit-id: 0135351e11c5776ecfe36b40d5d95a0c1101bb82 [formerly 2c8d14406b]
Former-commit-id: 744391e3f6
2013-02-19 18:46:16 -06:00
Steve Harris
bca88ba9c7 Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]
Former-commit-id: 81f1fb83a0
2013-02-19 12:22:00 -06:00
Roger Ferrel
317076ce71 Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time.
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869

Former-commit-id: 28b0f753fc [formerly a2e61d32a1] [formerly bdf58f534a1e9f71e4fb55fa7da4a957cb84b42d [formerly 1b693994a5]] [formerly 1d51a10f4b [formerly 1b693994a5 [formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 1c5d3ed74cec47761bf7aea165a116a3c8bbdfbb [formerly 211a39c333]
Former-commit-id: 94eb5757b5
2013-02-18 12:15:39 -06:00
Richard Peter
9c0ff50ba0 Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
Former-commit-id: 05f5f4daf3 [formerly 3c126b0ab1] [formerly 355e6d2c67] [formerly 4fb1cb27dc [formerly 355e6d2c67 [formerly a07a434ad71986aa4b474dd88e266035e347efa4]]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 434b4343506bf7b287825895ce602614fe47b40d [formerly 8991c1c86d]
Former-commit-id: 4f3d9ab931
2013-02-18 09:35:53 -06:00
Steve Harris
e6f3a88bd9 Merge branch 'master_13.2.1' (13.2.1-8) into omaha_13.2.1
Former-commit-id: 8a9c021b70 [formerly 15d6e6ad3b] [formerly ae66ccc3ee] [formerly acaef77d90 [formerly ae66ccc3ee [formerly 5e40606e95d506d213de3916f0f5d3a4eee7884a]]]
Former-commit-id: acaef77d90
Former-commit-id: 2db0d95e2593fe2ab6b520361f1d9c77362404b7 [formerly 8da2277243]
Former-commit-id: 2c7ff9b631
2013-02-18 09:14:13 -06:00
Steve Harris
db02d32440 13.2.1-8 baseline
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]
Former-commit-id: 8cffb55371
2013-02-18 09:09:41 -06:00
Ron Anderson
d09967b88e Merge "Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development
Former-commit-id: 7d09df8468 [formerly cf0fc8d921] [formerly e70cfc5825] [formerly a6d87cdd7e [formerly e70cfc5825 [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]
Former-commit-id: a6d87cdd7e
Former-commit-id: a76fdb7843d8fd407d0de1a07b1a83103ec4b3cb [formerly 999ac02aea]
Former-commit-id: 292614bc25
2013-02-18 08:31:50 -06:00
Steve Harris
825a99770d 13.2.1-8 baseline
Former-commit-id: 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]]
Former-commit-id: 535a9402a7
Former-commit-id: 0a9388f77add45c1702ce16113b0c20068e2d223 [formerly a68ce64f45]
Former-commit-id: 58bafc0068
2013-02-18 09:23:06 -05:00
Mike Duff
6628aea419 Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 269babb3d811c862c91f7c6f2b44a05605b7552e [formerly 079ec4b6dd]
Former-commit-id: 3e59308771
2013-02-18 08:16:57 -06:00
Richard Peter
67a541c54a Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development
Former-commit-id: c8d46448bf [formerly 5bf0e0e999] [formerly 51533ccab2] [formerly 70f270ff16 [formerly 51533ccab2 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]]
Former-commit-id: 70f270ff16
Former-commit-id: 5a84f9cf95566309fac283f2dc58dcbbe30280d4 [formerly 2299503559]
Former-commit-id: 1b112227a8
2013-02-15 16:40:04 -06:00
Richard Peter
720f324789 Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
Former-commit-id: 69897b3aa2 [formerly b3e2ca7b30] [formerly a40ae4d8b2] [formerly a6fa92923f [formerly a40ae4d8b2 [formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]]
Former-commit-id: a6fa92923f
Former-commit-id: 8f5d31cba589ac5b371ec575b4cd127eeae8019e [formerly 5936f671ce]
Former-commit-id: 774ea0ede6
2013-02-15 16:33:00 -06:00
Ron Anderson
9fa2a2b3f0 Issue #1629 fix error storing preferences in GIS Viewer
Change-Id: Id677dd9206c16f8c95b022e31fcac7acc6b07eb6

Former-commit-id: 4b871f33cc [formerly d4a915b48d] [formerly 689c32a9c3] [formerly 354d8b0366 [formerly 689c32a9c3 [formerly 7d73fd3f0f2d8ebbbf75d5928b06202f5f7cd42a]]]
Former-commit-id: 354d8b0366
Former-commit-id: 936c2dfeb6b936ee28f4a3df3ab76ed70aa003e9 [formerly 4334fab2f9]
Former-commit-id: ca6ca60f22
2013-02-15 13:44:52 -06:00
David Gillingham
67c98b866c Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing
UIControllers to be constructed at startup, not on demand.

Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132

Former-commit-id: 65b1aeb7f3 [formerly 9fae6695e2] [formerly 871364d630] [formerly da091b723d [formerly 871364d630 [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]]
Former-commit-id: da091b723d
Former-commit-id: 2d27bf86785994cdfd9f88f8093afe2f1d435b78 [formerly 244bc9b270]
Former-commit-id: cc05bdae4e
2013-02-15 12:50:48 -06:00
Jonathan Sanchez
b4a051cf83 Issue #1624 Temporary fix for NullPointerException.
Former-commit-id: b07504916f [formerly 18dd00e488] [formerly f507d23fed] [formerly fea6b44036 [formerly f507d23fed [formerly f95a402347ae45ad133206bfea796b240decf0a6]]]
Former-commit-id: fea6b44036
Former-commit-id: 81c45a8e55f371727b4db8a17400440ba254b82d [formerly 1486022395]
Former-commit-id: 763280dd53
2013-02-15 12:31:21 -06:00
Lee Venable
b241812a72 Merge "Issue #1607 Added time variables for CORs." into development
Former-commit-id: 7d85071ae2 [formerly 628d0d9840] [formerly d94233499a] [formerly 91e016aa34 [formerly d94233499a [formerly 7a6200d4bfe21feb6e29603dd638876f50a66162]]]
Former-commit-id: 91e016aa34
Former-commit-id: 071a283e723cacbd51481fa4c13e68fbca37df1d [formerly 38bbca4895]
Former-commit-id: 5ec5918e45
2013-02-15 12:08:15 -06:00
Nate Jensen
218d26f676 Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
Former-commit-id: 8722cf18fa [formerly 1b1e468e1f] [formerly f748815e22] [formerly f79f7db348 [formerly f748815e22 [formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]]
Former-commit-id: f79f7db348
Former-commit-id: 46c56447c7896eda732cfe5904eeba4f40dbdfdd [formerly a60cf277bc]
Former-commit-id: d6ba283efc
2013-02-15 11:56:11 -06:00
Ben Steffensmeier
a0f06eff69 Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: d35b79d537 [formerly e771076275] [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 1393f3e3cf [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]
Former-commit-id: 0933a5f596
Former-commit-id: 133a0064f1bda2cc9d635ce7bed097b681dd8dd1 [formerly f0f3c71d50]
Former-commit-id: 91bbdc3337
2013-02-15 11:39:56 -06:00
Ron Anderson
ffa635c5c3 Issue #1629 Attempt to fix error saving preferences in GIS Viewer
Change-Id: I982637de1cc898d9887849a8276a3693b9579d5b

Former-commit-id: 528ce62800 [formerly 3033238f1b] [formerly d574da6155] [formerly b76653a885 [formerly d574da6155 [formerly f0d1aa59c4971ed523e4f26b440134a417aec5d0]]]
Former-commit-id: b76653a885
Former-commit-id: 085730a171749caf4793b166e229b9102825e3a8 [formerly df84bf7f86]
Former-commit-id: 632bd48a45
2013-02-15 11:13:43 -06:00
Jonathan Sanchez
f47b82e1ae Issue #1607 Added time variables for CORs.
Former-commit-id: 092014d433 [formerly 38802d3df8] [formerly 6d968dc09d] [formerly 3025639923 [formerly 6d968dc09d [formerly 311f633ba47efcf3b13f77867e1fa32a584f3232]]]
Former-commit-id: 3025639923
Former-commit-id: 82add2e0659e51786287108a10a857ffcdbfc0c4 [formerly bb797eeb74]
Former-commit-id: 352d3dea5a
2013-02-15 09:59:12 -06:00
Ron Anderson
12f2ac0171 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: 05e20f4050e6fac5a3d4a69d2e1baa354ff73eaf [formerly e952a4f179]
Former-commit-id: d69d628450
2013-02-15 09:03:41 -06:00
Dustin Johnson
72cb5b436b Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41

Former-commit-id: c638eca350 [formerly 4be6c12ac6] [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 714ea1c8d8 [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]]
Former-commit-id: 6e2f69939f
Former-commit-id: 11d3a956bd7f1cc9a0583c0a5584b6470fe49630 [formerly 1ef440f8ee]
Former-commit-id: d0ecd69456
2013-02-15 08:13:11 -06:00
Nate Jensen
2ea8bed072 Merge "Issue #1627 Sped up FFMp load by removing un-needed DB calls." into development
Former-commit-id: 7b50014701 [formerly be680f2523] [formerly 7cf29fbf39] [formerly 6d8b8dd774 [formerly 7cf29fbf39 [formerly c83110e509d662da0a4b1975bc1044fb7ffadb9e]]]
Former-commit-id: 6d8b8dd774
Former-commit-id: 36514f8fcd747455dbc8fbd4296f690655aa80f6 [formerly 0ce3009528]
Former-commit-id: ebb3394719
2013-02-14 16:39:23 -06:00
Ben Steffensmeier
4140260659 Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: bd6e0f8462 [formerly 1940a92596] [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly aa4c7526ff [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: badd785e8aa7a433093d24b4c4bf0d45450daf4a [formerly 455aa4628f]
Former-commit-id: 086f6aabe9
2013-02-14 15:34:25 -06:00
Dave Hladky
7dd7e3c60a Issue #1627 Sped up FFMp load by removing un-needed DB calls.
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956

Former-commit-id: 51e0b648c2 [formerly 83fe9ca104] [formerly 8247da158f] [formerly a8f6635a6f [formerly 8247da158f [formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]]
Former-commit-id: a8f6635a6f
Former-commit-id: 43df1692452b561e0563a12fb2d7b4e6d7f53414 [formerly 4cd9b2e8b2]
Former-commit-id: 7f6381ec5c
2013-02-14 15:12:29 -06:00
Nate Jensen
3724151397 Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
Former-commit-id: ed195ae9e4 [formerly 5526ee7e8d] [formerly 1144f08e59] [formerly a3e0bf09ab [formerly 1144f08e59 [formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]]
Former-commit-id: a3e0bf09ab
Former-commit-id: b34b2a8b576d4d26a79a47c3f0f154dd8bdc4ee2 [formerly 3f5b8b56ef]
Former-commit-id: b4aea0385c
2013-02-14 15:05:14 -06:00
Dave Hladky
ba8eb2b557 Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950

Former-commit-id: 65f4e442bc [formerly 2655952304] [formerly 7b3a310f67] [formerly 381aec5976 [formerly 7b3a310f67 [formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]]
Former-commit-id: 381aec5976
Former-commit-id: a3bb927b21e71fee86b6ae81fd130425b9672bcf [formerly 5c66cbcd27]
Former-commit-id: a17dee033a
2013-02-14 13:58:32 -06:00
Lee Venable
021b0d1944 Merge "Issue #1605 Improved finding closest area locations. " into development
Former-commit-id: 2bc6178923 [formerly 4383968e23] [formerly b047a0393f] [formerly 60f3f46d19 [formerly b047a0393f [formerly 1c778e9c7140214bed727a2eac73c0461d134341]]]
Former-commit-id: 60f3f46d19
Former-commit-id: 14199f34eb2d9b3903ec0369994476b870a3aafe [formerly 4952a3f595]
Former-commit-id: dfef1c916a
2013-02-14 12:56:01 -06:00
Matt Nash
1844303e5d Issue #1506 move away from using QueryScript on the UI thread, except where
absolutely necessary we can run a synchronous operation

Change-Id: I4503d4e18e3f458b7df7c2d187e8880d5a3d2cc7

Former-commit-id: 2a42ae7a47 [formerly 75f51be7b2] [formerly bc954889eb] [formerly 5b136272a3 [formerly bc954889eb [formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]]
Former-commit-id: 5b136272a3
Former-commit-id: f620d70c55f78938b7e41137630295768daa3ffe [formerly d29162c654]
Former-commit-id: 126537966c
2013-02-14 11:47:34 -06:00
Ron Anderson
65389ddcff Merge "Issue #1515: Better handle notifications received after disposing VCParms." into development
Former-commit-id: c34674110b [formerly 11212b51db] [formerly e04322f7ad] [formerly 96fee6ea56 [formerly e04322f7ad [formerly 1f5fbc207e533be5a7dde9651dd35743a0fc3a34]]]
Former-commit-id: 96fee6ea56
Former-commit-id: 3da1ec5d391f1861f769ed3a1649b6c08ae21bb6 [formerly b5ff9b6998]
Former-commit-id: 377e85913f
2013-02-14 11:13:26 -06:00
Jonathan Sanchez
003ae9b612 Issue #1605 Improved finding closest area locations.
Former-commit-id: e05b15e7be [formerly 4555420e82] [formerly 9641b67da4] [formerly 1722713689 [formerly 9641b67da4 [formerly b8a43d95121a1876dc8136bd5758e9452167fad2]]]
Former-commit-id: 1722713689
Former-commit-id: ab881bc4d23c7177114509bed49eff331e2a2c20 [formerly 459472a793]
Former-commit-id: c1a832ef3a
2013-02-14 11:12:23 -06:00
Ben Steffensmeier
fb7100ddc2 Issue #1614 allow locationNames for grid data access
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: 31605a14aa [formerly ef7addb005] [formerly ab319bd3a8] [formerly 9b4de367e3 [formerly ab319bd3a8 [formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]]
Former-commit-id: 9b4de367e3
Former-commit-id: a85d7d1d1a99549985dadde8efd31a21ab2de327 [formerly 0995024482]
Former-commit-id: efaddb710c
2013-02-14 10:07:01 -06:00
Nate Jensen
f6c673fd7c Merge "Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away." into development
Former-commit-id: d5351574ee [formerly e3b89f87c6] [formerly 5b8504196e] [formerly 25580a8adc [formerly 5b8504196e [formerly 4c1268c3d9c8acaad2fe334c97ee2fb8f6d5ccff]]]
Former-commit-id: 25580a8adc
Former-commit-id: 63a4321041f7c5785f7d8e40bdbdac3078dcb835 [formerly dcb90069cf]
Former-commit-id: 3ff7ce2248
2013-02-14 09:26:14 -06:00
Roger Ferrel
c9cf643894 Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away.
Change-Id: I7716af97c3a94f2243be1b219ed9f91c7b67c0d8

Former-commit-id: 67ea75b00c [formerly bfb9f9f156] [formerly 2b509cf7de] [formerly e26689a487 [formerly 2b509cf7de [formerly 9ac5a199108a1e1d106a79e67cd6209bd46134cb]]]
Former-commit-id: e26689a487
Former-commit-id: 683835359834ffdf46d9f8b203a98db8326d8f6d [formerly e7bae3c272]
Former-commit-id: 951e5b237d
2013-02-13 16:45:52 -06:00
Ben Steffensmeier
f03eab61a7 Issue #1621 Fix model run precip.
Change-Id: Ia488b75544778714fa180dd981f150241351c4d2

Former-commit-id: fda7e31331 [formerly 0e860d434c] [formerly c9e4993fa432c2955410b39411a72fb25fced929 [formerly c171998d91]] [formerly 41a7766cd9 [formerly c171998d91 [formerly 8969af754acb0c987d0dc565edda9d0793188118]]]
Former-commit-id: 41a7766cd9
Former-commit-id: 20a9e533db7a29629247337052c7e3335b123605 [formerly 8585229352]
Former-commit-id: 823f75f6c7
2013-02-13 15:41:39 -06:00
Max Schenkelberg
4d6091450a Issue #1610 Fixed null pointer on FileTreeView when file updates arrive and view has not expanded file structure
Change-Id: Ibfa11dc41ee5fa2a7421469a58932b415261c343

Former-commit-id: 7ede523b45 [formerly 2f8b88df4d] [formerly ecb0906597] [formerly 02207b777c [formerly ecb0906597 [formerly 71b40ef692f0c2109e1026ac5d953d34e808938f]]]
Former-commit-id: 02207b777c
Former-commit-id: 25208ef3a3aee4c72d93ee79ac6912cad2b79071 [formerly bbc904894a]
Former-commit-id: 66512cecc6
2013-02-13 15:18:54 -06:00
David Gillingham
965feb571b Issue #1515: Better handle notifications received after disposing VCParms.
Change-Id: Ia73102329755303b504871ed55f2a294ef390126

Former-commit-id: 5dc773e1d8 [formerly 02f2539433] [formerly 5b4de19ebd] [formerly ddcc84262a [formerly 5b4de19ebd [formerly ef9d97a4d0886df2072672b1cebc9b77e689308b]]]
Former-commit-id: ddcc84262a
Former-commit-id: 54fad731f6b5bba1bf4ee023995c413a2ff321cd [formerly 874434cea9]
Former-commit-id: a6883700ee
2013-02-13 11:08:20 -06:00
Lee Venable
ff539f12fd Merge "Issue #1606 Did not set default bullets for CORs." into development
Former-commit-id: 1cfa74b419 [formerly d00a325041] [formerly ffd4bf0028] [formerly 3b8bb09da1 [formerly ffd4bf0028 [formerly 15403138929b735070553ec08d4e44e4bfc1811e]]]
Former-commit-id: 3b8bb09da1
Former-commit-id: 6e7278bf791aa2936a2d427d06f5ddaf5dff5bb3 [formerly bfcbfb3f00]
Former-commit-id: 5db93bcf71
2013-02-13 10:31:14 -06:00
Richard Peter
94687fd587 Merge "Issue #1526 refactor for clarity and to stream responses from pypies" into development
Former-commit-id: adfa19f202 [formerly 7438d87e58] [formerly e611aab017] [formerly dbcb8bd30e [formerly e611aab017 [formerly a8d1d7259bf914fac127361bde67d6513f775e8f]]]
Former-commit-id: dbcb8bd30e
Former-commit-id: 71869f16dc6facff3b2a1124465e8222335ed29e [formerly 6ec1990bd9]
Former-commit-id: 0804763d1a
2013-02-13 10:18:24 -06:00
Jonathan Sanchez
53f660c088 Issue #1606 Did not set default bullets for CORs.
Former-commit-id: c18279c3b9 [formerly 0c3d09f230] [formerly a061ee1363] [formerly 0a8b38d8e9 [formerly a061ee1363 [formerly 4eb79ee90cf684b8ae38404586a65f09742eb348]]]
Former-commit-id: 0a8b38d8e9
Former-commit-id: 54c0da05221f60919fd66c8ce7f2d6517006f822 [formerly bdcac83ac7]
Former-commit-id: b6047c78bb
2013-02-13 10:08:01 -06:00
Lee Venable
f69ef9f635 Merge "Issue #1600 Correctly set the StormTrackData motion direction for a CAN and EXP." into development
Former-commit-id: e75bd2ea71 [formerly 39351ec038] [formerly 0d1ebacc71] [formerly 10008011b4 [formerly 0d1ebacc71 [formerly c821cfcc556efb4586eb6e9122a90731a7f42083]]]
Former-commit-id: 10008011b4
Former-commit-id: bbf598db3be43e11c985b5761bc9a226b6143867 [formerly 44a4701c1e]
Former-commit-id: 6ecbdae667
2013-02-13 08:58:07 -06:00
Max Schenkelberg
ca10fdf501 Issue #1500 Fixed concurrent mod exceptions
Change-Id: I66c2bd159e7631a826a5bb9d0f06d0f3364a2f22

Former-commit-id: eb63599738 [formerly 599e3bd319] [formerly 7c3f0cc295] [formerly ccf58ba87e [formerly 7c3f0cc295 [formerly b7f6998ac508c65440c2969b78e45de8f19c0ad9]]]
Former-commit-id: ccf58ba87e
Former-commit-id: a798a189e420d8432111e5dc2ade23ec3ac7a276 [formerly 55f882b00f]
Former-commit-id: 27b8d411b7
2013-02-12 17:35:30 -06:00
Jonathan Sanchez
20a4af9aec Issue #1600 Correctly set the StormTrackData motion direction for a CAN
and EXP.

Former-commit-id: 61393b3279 [formerly cd8d9ff3db] [formerly 6d463f0c74] [formerly c2a9e1c215 [formerly 6d463f0c74 [formerly e82da0ee983f1a9889e25b088e2eadebb8c08fff]]]
Former-commit-id: c2a9e1c215
Former-commit-id: 745f6c1a8de8af8fefee0a768801343c1f5a6f5a [formerly e8f64e5121]
Former-commit-id: b4a7b7407b
2013-02-12 17:20:55 -06:00
Nate Jensen
86f216d855 Issue #1526 refactor for clarity and to stream responses from pypies
Change-Id: Ia07aca01a528b51de4fd20571edaa90cc06631d7

Former-commit-id: 3e3c419ff3 [formerly 56112143c3] [formerly 96232ab0ab] [formerly 92076242fc [formerly 96232ab0ab [formerly 26ba8a930a723ccbecdc09d873cbcb917e8b453e]]]
Former-commit-id: 92076242fc
Former-commit-id: 7461b87c7c8671c256729eaacaf9ad90552f18f9 [formerly cbca34e709]
Former-commit-id: 54cea219cf
2013-02-12 16:33:01 -06:00
Steve Harris
798b6a74c9 Merge branch 'ss_builds' (13.2.1-7) into development
Former-commit-id: 07da026084 [formerly 760be15f59] [formerly cc2757790c] [formerly de437bb4fc [formerly cc2757790c [formerly 62e4a9045e32eaaf1a52ff06d86f82d2693021bd]]]
Former-commit-id: de437bb4fc
Former-commit-id: a0488568742999c0e16836755520381eb1d79b33 [formerly 3690662bf7]
Former-commit-id: 7c5e57d662
2013-02-12 15:30:10 -06:00
Steve Harris
ccdd71ecb1 13.2.1-7 baseline
Former-commit-id: d329ce58fe [formerly 3f271af195] [formerly 2fb5a31b98] [formerly 6baff6a089 [formerly 2fb5a31b98 [formerly 85a6ac3debfd1691b5d44c547d76a7ae9e19523f]]]
Former-commit-id: 6baff6a089
Former-commit-id: 01738ba4ddcf2c4a38a9cdfb34e37504fe677bae [formerly bac9b967aa]
Former-commit-id: 2d04721c4b
2013-02-12 15:27:30 -06:00
Steve Harris
1699141ca3 13.2.1-7 baseline
Former-commit-id: 934a76bd7e [formerly 0b7287b130] [formerly 6fad5da5ed] [formerly 9c23bf6e73 [formerly 6fad5da5ed [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]]
Former-commit-id: 9c23bf6e73
Former-commit-id: 026d981189675d233e618f3f607c027654752432 [formerly 6bfbfc8a5e]
Former-commit-id: 6780b60df5
2013-02-12 14:51:26 -06:00
Nate Jensen
a4ecb1ef74 Merge "Issue #1604 fix null pointer on double clear in D2D." into development
Former-commit-id: 63212c9e6d [formerly ec55fe251a] [formerly 75e3292b2b] [formerly e55eb5cc70 [formerly 75e3292b2b [formerly b8c34d0f645dec253188142c815efa7b3d428db6]]]
Former-commit-id: e55eb5cc70
Former-commit-id: 83a2625fd964686b4c8f81ea5494fb276e0c486b [formerly 8c1b88b3ef]
Former-commit-id: 14424e1154
2013-02-12 10:56:33 -06:00
Ron Anderson
57f92058bf Merge "Issue #1554 initial implementation of GFE grid factory. Change-Id: Id2ae308c0c13822dd6e5dd0195f7920df82ff994" into development
Former-commit-id: be8b5758b6 [formerly dfe0723e65] [formerly 5bee722544] [formerly 9713b42306 [formerly 5bee722544 [formerly 7c4d695201e473de349f4f5a83a1a5283d6cb4f4]]]
Former-commit-id: 9713b42306
Former-commit-id: 5ff327a367d34fe0fa7a98924deda2e3dbd73460 [formerly 184cd6d508]
Former-commit-id: 1ec0410989
2013-02-11 17:20:21 -06:00