xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1133 commits 31 branches 40 tags 3.8 GiB
Commit graph

116 commits

Author SHA1 Message Date
Roger Ferrel
e9cbda7258 Issue #1287 Code changes for non-blocking SaveDeleteRefDialog. 
Change-Id: I6bf23b8f3d9bac171f9a296e3d47b86851a3e1e0

Former-commit-id: fb7718b10c [formerly 6dfa000535] [formerly c2def88db1] [formerly fb7718b10c [formerly 6dfa000535] [formerly c2def88db1] [formerly 347ad433ef [formerly c2def88db1 [formerly 085fc755257ed8728a293d59670a79f79293dcbb]]]]
Former-commit-id: 347ad433ef
Former-commit-id: 85a3873f26 [formerly 9775ab09d0] [formerly 87aa5def082766bdf15bdf674a479883d407301a [formerly 56515fc4d6]]
Former-commit-id: 22f9ed38dac5d7edfb81ce205648f3b79b76b9dd [formerly f0867f4c40]
Former-commit-id: c36e471404
 2012-10-24 12:41:33 -05:00
Roger Ferrel
85e91172bc Issue #1287 Changes for non-blocking CreateFromScratchDialog. 
Change-Id: I8a2152d834966992f8d4bbe8e4b72f7d9c7c3da0

Former-commit-id: 719be123fb [formerly 58ada46176] [formerly 50d65fefcb] [formerly 719be123fb [formerly 58ada46176] [formerly 50d65fefcb] [formerly 9fa924aecb [formerly 50d65fefcb [formerly 1cf83fa5e226f551c5d4cad3b5fa9f97b3203733]]]]
Former-commit-id: 9fa924aecb
Former-commit-id: a0ed28e7cf [formerly 34b84bcf2a] [formerly d959f8dd660ff29c640dee5273dd79773991ddc4 [formerly c6752668e4]]
Former-commit-id: 2bb75e766cc4b0e1e87392c40454ff9054a65e30 [formerly 823e1099e9]
Former-commit-id: 60dfce2758
 2012-10-24 10:52:51 -05:00
Roger Ferrel
28adc6b2f0 Issue #1287 Changes for non-blocking DefineRefSetDialog. 
Change-Id: I0aa3ec5b80140ae79fffd3edd230b1d8e8f68e43

Former-commit-id: f7d694f7a1 [formerly 80c0d6b69e] [formerly eb5aa48960] [formerly f7d694f7a1 [formerly 80c0d6b69e] [formerly eb5aa48960] [formerly c627c6af24 [formerly eb5aa48960 [formerly 3fd7556be39d7381c3cdc92a3b72a6ff10c2ebed]]]]
Former-commit-id: c627c6af24
Former-commit-id: 53e447934b [formerly 5ad7545d15] [formerly af280dc7e2baaad3051f813fa9d67e6ab51f5ab2 [formerly be40b56d18]]
Former-commit-id: 5e8603474943af911b9e0dddb9b5b09308665404 [formerly 0a60b2f0ba]
Former-commit-id: 47023b93aa
 2012-10-24 10:42:33 -05:00
Roger Ferrel
f8fe4a66a4 Issue #1287 Changes for non-blocking DefineSamplesViaLatLongDialog. 
Change-Id: Id9b6d7feec00ae483f80cfa386ad31fdce3d8dea

Former-commit-id: c4d2f21061 [formerly db4f7b17cf] [formerly 8d8850174e] [formerly c4d2f21061 [formerly db4f7b17cf] [formerly 8d8850174e] [formerly 122012d767 [formerly 8d8850174e [formerly a90e1b6f168e54d3a1a6581b692e84288de537f3]]]]
Former-commit-id: 122012d767
Former-commit-id: adf86701f8 [formerly 8cd67ae67d] [formerly 5716e0025ee7897a90582f9af6f7c2693779dd1a [formerly 6aab2f1d8b]]
Former-commit-id: 7a9d5553e2a48852313065289057ca0f501e7f92 [formerly fba81ec4b0]
Former-commit-id: 077baaca1c
 2012-10-24 09:30:03 -05:00
Roger Ferrel
c17a798acd Issue #1287 Changes for non-blocking but modal CopyGridsDialog. 
Changes from reviewer comments.

Change-Id: I743752720d1c770e740912e2d6c3049d516c8183

Former-commit-id: 1c7e9262a4 [formerly c132e8cc91] [formerly 1cac983c4f] [formerly 1c7e9262a4 [formerly c132e8cc91] [formerly 1cac983c4f] [formerly e49535d318 [formerly 1cac983c4f [formerly ced609c6997ae3a4fc51d254218be600d5338ac2]]]]
Former-commit-id: e49535d318
Former-commit-id: 7c5b618d00 [formerly 084a35d697] [formerly dba30e4ff57dc4eb8d6e9f8d1b228583fdf8fe7e [formerly 277c5c1a1d]]
Former-commit-id: b20b6684ea8f4964de9e8a50345b0deed09ca670 [formerly 724ddea4d2]
Former-commit-id: b9d760ac42
 2012-10-24 07:35:59 -05:00
Roger Ferrel
33741d9769 Issue #1287 Changes for non-blocking BreakLockDialog. 
Change-Id: Ie2626e8960d69a200bc1b5c6ee28c6aa361f30ca

Former-commit-id: 90590f7ae2 [formerly 9e2496dd0b] [formerly a9dbaae595] [formerly 90590f7ae2 [formerly 9e2496dd0b] [formerly a9dbaae595] [formerly d33179f009 [formerly a9dbaae595 [formerly 2dc320c31ceed44bba70d6738ce40d703858be68]]]]
Former-commit-id: d33179f009
Former-commit-id: e99ed8f507 [formerly 3790b5d9c4] [formerly 43001b8a191ed5fa33014d973b0b9693520ab7c9 [formerly 9f0586231f]]
Former-commit-id: 4fb2082dcf1e222ffe73892486f80d3edd8645c2 [formerly 627c685f42]
Former-commit-id: 4532cb8445
 2012-10-23 14:54:47 -05:00
Ron Anderson
bff6c36691 Merge "Issue #1257: Fix GFE HDF5 Retrievel to time correlate results to requested times." into development 
Former-commit-id: 86ee554032 [formerly 32535286e3] [formerly aeff911d8b] [formerly 86ee554032 [formerly 32535286e3] [formerly aeff911d8b] [formerly d942797296 [formerly aeff911d8b [formerly 5ea502772674571298bf8801863d2711a9d201fd]]]]
Former-commit-id: d942797296
Former-commit-id: 6149ad5a22 [formerly 5027415c52] [formerly cb6dcbca127d26cfa5dca85187a22a23b5947406 [formerly d9a00da60f]]
Former-commit-id: de20ebb642db45b443e5219d3eeb6e63eb742a67 [formerly 15f600afa7]
Former-commit-id: 09496fbe8e
 2012-10-23 14:47:57 -05:00
Roger Ferrel
d0222e73c4 Issue #1287 Changes for non-blocking AutoSaveIntervalDialog. 
Change-Id: I5ea021d0658e68553542c88c8850fea4b9de696b

Former-commit-id: 04755d4801 [formerly 2048a41563] [formerly 3e852fc9b5] [formerly 04755d4801 [formerly 2048a41563] [formerly 3e852fc9b5] [formerly 17085ba699 [formerly 3e852fc9b5 [formerly d1601fee5b3de86e0120553d17ee18cf0b482e63]]]]
Former-commit-id: 17085ba699
Former-commit-id: 05bcf19c11 [formerly 1ce417b106] [formerly f7c0825e14808bc4206e2079a6f326e86e2d6e11 [formerly 6b9f409486]]
Former-commit-id: f586d6ac7f7381c925f4555a168a5ddc5dfa1240 [formerly 2ac417247f]
Former-commit-id: 7f59b9efa1
 2012-10-23 13:54:50 -05:00
Richard Peter
ac20a79c5c Issue #1257: Fix GFE HDF5 Retrievel to time correlate results to requested times. 
Change-Id: I4fb15e8e712155f6099bd27880fbcbdf1948fc5f

Former-commit-id: f829123ab3 [formerly f94ba53663] [formerly 2e025e09e2] [formerly f829123ab3 [formerly f94ba53663] [formerly 2e025e09e2] [formerly 0d10680b28 [formerly 2e025e09e2 [formerly 6077558dbd06f8fdb568f03c163352b080a9eb5e]]]]
Former-commit-id: 0d10680b28
Former-commit-id: 6de38e59b2 [formerly 5dd0edf429] [formerly 54e53ef12b0d93e7ceab43255980ea5a0552d734 [formerly 5bc200bb88]]
Former-commit-id: 5941df45709f622d3331edead2b486c6dcea6380 [formerly f53f3ea64f]
Former-commit-id: ddf41c8de6
 2012-10-23 13:52:25 -05:00
Roger Ferrel
e41a96d0f3 Issue #1287 Changes for non-blocking FormatterLauncherDialog and code cleanup. 
Change-Id: If2fbef2f2a128ff151525eed4feaf4273fa99855

Former-commit-id: d0a88b88a3 [formerly 257bdcaa91] [formerly 656f582e22] [formerly d0a88b88a3 [formerly 257bdcaa91] [formerly 656f582e22] [formerly 525a5bb8d1 [formerly 656f582e22 [formerly 936092efc2f69ab3e2060334fddd630100da4157]]]]
Former-commit-id: 525a5bb8d1
Former-commit-id: 624ae21f37 [formerly d82d50faf1] [formerly c93f8795e80bbe1ad3e4947807e86c58c7778004 [formerly cc5ef23f23]]
Former-commit-id: a4984ffc703024199626595fad19c095b102da16 [formerly 38bc6ea4e9]
Former-commit-id: 346e8851fb
 2012-10-23 12:40:48 -05:00
Roger Ferrel
48e1f9c907 Issue #1287 Changes for non-blocking but modal DisplayAttributesDialog. 
Change-Id: I57df579cd29ffa2bb54589bf5862121857abedb0

Former-commit-id: bedb0bc955 [formerly 04053afeb7] [formerly 8152c49231] [formerly bedb0bc955 [formerly 04053afeb7] [formerly 8152c49231] [formerly b0c5e6472b [formerly 8152c49231 [formerly 4dca1f343e38090c21e27f0470cc68042c22c811]]]]
Former-commit-id: b0c5e6472b
Former-commit-id: 8f11dc7705 [formerly f96c5a1e28] [formerly 512070f3948e4d88364c8b0850da3cfb655fd3f9 [formerly 8ac665a0ca]]
Former-commit-id: 9177bd5fa3a6c1450301013cf31cb142ec6d4cab [formerly ed86da12d7]
Former-commit-id: 5843833581
 2012-10-22 15:35:50 -05:00
Steve Harris
5cd4d01a55 Merge branch 'ss_builds' (12.11.1-6) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 95727755c7 [formerly 3eff876edd] [formerly a7337d9160] [formerly 95727755c7 [formerly 3eff876edd] [formerly a7337d9160] [formerly 1807100932 [formerly a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]]
Former-commit-id: 1807100932
Former-commit-id: 81db247276 [formerly 8486da2fd3] [formerly a722324705ed3164c37a327413de2e52d14ffae3 [formerly 892e4df811]]
Former-commit-id: 2c3f7e188dd7eb8262650be538cc95ed16f9e7d2 [formerly 8a17564ba3]
Former-commit-id: 35c2a8e26f
 2012-10-18 16:01:05 -05:00
Steve Harris
2d368b5b0b 12.11.1-6 baseline 
Former-commit-id: 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: ae73939b02 [formerly 8beb6fc0b8] [formerly 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14]]
Former-commit-id: bfbc6b62be31cb07dee1061fd2ffeb9b2a9e932a [formerly 4f27cbb406]
Former-commit-id: 9c597c7060
 2012-10-18 15:53:01 -05:00
Roger Ferrel
2ade635a18 Issues #1229 Changes for non-blocking ColormapDialog. 
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: bacff2f0f1 [formerly cdf5c546ab] [formerly 8e86f32714] [formerly bacff2f0f1 [formerly cdf5c546ab] [formerly 8e86f32714] [formerly 6833c7e04c [formerly 8e86f32714 [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]]]
Former-commit-id: 6833c7e04c
Former-commit-id: 85fbb59441 [formerly 1075e8ba16] [formerly 68aa8f3b270c031298664186936eadb3c07db89b [formerly d5acf40cc2]]
Former-commit-id: 32cb5256c1d353286a8d4ed42615eb89d5e6975b [formerly a53f94e93d]
Former-commit-id: 382f5b234c
 2012-10-17 10:20:18 -05:00
Steve Harris
ec74d87147 Merge branch 'ss_builds' (12.11.1-4) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]]
Former-commit-id: 751563e331
Former-commit-id: d88afce365 [formerly d0e91329b4] [formerly 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]]
Former-commit-id: 188da5301da8f47f50c81e58f02ec2fbae69747e [formerly ad78266035]
Former-commit-id: 1e4c737ff2
 2012-10-16 15:48:14 -05:00
Steve Harris
8794e3b599 12.11.1-4 baseline 
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
 2012-10-16 13:27:07 -05:00
Ron Anderson
21e4866c3b Issue #1091 Fixed combination file generation. 
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

Former-commit-id: e3d598d337 [formerly c264f72a53] [formerly 4ca413a222] [formerly e3d598d337 [formerly c264f72a53] [formerly 4ca413a222] [formerly 510cabe655 [formerly 4ca413a222 [formerly 0c4bf9ce1271334d2a07205a42efc60cf7c397f0]]]]
Former-commit-id: 510cabe655
Former-commit-id: d4eaa7a659 [formerly 488d357413] [formerly db13c0f5d9711fc778c639ebf3e3fedd6dee6c74 [formerly e0fc2a36c6]]
Former-commit-id: 9dd0497e892d907423f733d65f93e3fd05c58b4f [formerly 47da164ca6]
Former-commit-id: 9a588ce114
 2012-10-12 10:32:36 -05:00
Steve Harris
92a6b72092 Merge branch 'ss_builds' (12.11.1-2) into development 
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73

Former-commit-id: a6c3e16c69 [formerly 7be572b27d] [formerly 8c97afe03b] [formerly a6c3e16c69 [formerly 7be572b27d] [formerly 8c97afe03b] [formerly 0895f22690 [formerly 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]]]
Former-commit-id: 0895f22690
Former-commit-id: d6f07f7013 [formerly 48a80a23e4] [formerly 0ccc977e5162ad8a17c1a30f58a15fa4f27ad13b [formerly 8dae024430]]
Former-commit-id: c55ffde48719b1c578dec26d2fc1779c951daf3e [formerly 8c81601905]
Former-commit-id: 198eca2a6c
 2012-10-08 13:29:34 -05:00
Steve Harris
75d99f4e93 12.11.1-2 baseline 
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 6e0b2c55d7 [formerly 772c60efa4] [formerly 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc]]
Former-commit-id: 8fe8231e2d1c3ba8a832320dad34957e6a59e8fe [formerly e72b6d5da6]
Former-commit-id: ff9321e3ce
 2012-10-08 13:26:20 -05:00
Ron Anderson
400e9fe1a1 Issue #1242 Fix wierd GFE behavior when Grid Manager is maximized. 
Change-Id: I2e6d6929a8a8af8dab3320bdf8cda3466fe05fa8

Former-commit-id: cf62687a6a [formerly 8136beddc7] [formerly b041ccf099] [formerly cf62687a6a [formerly 8136beddc7] [formerly b041ccf099] [formerly 8e8c713884 [formerly b041ccf099 [formerly 4fb21077aba1dd9cfafc7f046b02f24f750c6384]]]]
Former-commit-id: 8e8c713884
Former-commit-id: e8fc88fe89 [formerly 436284848c] [formerly 4f69b16583e431bc4dc6d51faceef73068d0c3dd [formerly 60171b46a2]]
Former-commit-id: 01e9cba5d2c1ad47faa3417c5cccd95a2a696fb4 [formerly 51abd858bc]
Former-commit-id: 419eac95ff
 2012-10-04 12:15:01 -05:00
Steven Harris
db663faca9 12.11.1-1 baseline 
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
 2012-09-27 15:57:45 -05:00
Ron Anderson
477b4d0ba4 Issue #436 Fix problem with Hazard Type and ETN/Seg not being correctly picked up when modifying a hazard grid. 
Change-Id: I58aef667f4f465c8550a51d20bb750b400d4f781

Former-commit-id: 00ec098d05 [formerly bfb241c335] [formerly d376c07465] [formerly 00ec098d05 [formerly bfb241c335] [formerly d376c07465] [formerly ca74b829d1 [formerly d376c07465 [formerly 909e1e815a2665d415a151d7641876b9eee004bb]]]]
Former-commit-id: ca74b829d1
Former-commit-id: ac47481534 [formerly fc7ee6aa6e] [formerly 5da8c29b508a0b41bcb2db60f4d19919a77a4157 [formerly 9746609849]]
Former-commit-id: 256662e44f6fca6e57b8ef2ab7a6a7e27ce6afe6 [formerly 4a8b9b6f0d]
Former-commit-id: 93464b8a98
 2012-09-26 13:20:48 -05:00
Ron Anderson
f571089cb8 Issue #1091 Code cleanup and update of online help files. 
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: 1eebe679a0 [formerly f1fb73e815] [formerly 4373858ac6] [formerly 1eebe679a0 [formerly f1fb73e815] [formerly 4373858ac6] [formerly 34382eb228 [formerly 4373858ac6 [formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]]]]
Former-commit-id: 34382eb228
Former-commit-id: c63f5b5a0c [formerly 1612c8d2c8] [formerly e5cdaf5d466bae7f7e1bccf0bf9aee3d7b754797 [formerly a609aab630]]
Former-commit-id: 26805c89600afbc5826fad5d1080d192a573c7bf [formerly 6f00c3b872]
Former-commit-id: 763b5aa86b
 2012-09-25 16:07:05 -05:00
Steve Harris
c340962852 Merge branch 'ss_builds' (12.10.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java

Former-commit-id: 6cb180ff5b [formerly 686b1756c9] [formerly 8354ca4e68] [formerly 6cb180ff5b [formerly 686b1756c9] [formerly 8354ca4e68] [formerly 3827a78a7b [formerly 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]]]
Former-commit-id: 3827a78a7b
Former-commit-id: 01f5a0b21a [formerly 8edfe17e7d] [formerly 194b5d78ca44a987232c43b536b8a7d0f46623ae [formerly f5f59b6aa5]]
Former-commit-id: abfb2e968285e9270187ca573daba380b3340361 [formerly a20533b551]
Former-commit-id: 94cb625e91
 2012-09-25 10:31:57 -05:00
Steve Harris
6fc7ef7034 12.10.1-8 baseline 
Former-commit-id: e6f952f0ea [formerly b062e4de8f] [formerly dbd73151ca] [formerly e6f952f0ea [formerly b062e4de8f] [formerly dbd73151ca] [formerly 73d29311d0 [formerly dbd73151ca [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]]]
Former-commit-id: 73d29311d0
Former-commit-id: 326954a0b8 [formerly f4e218c4dd] [formerly 28e9acf68c2e0b1a4c89ad83acb71825adbd9965 [formerly 94137c6ba1]]
Former-commit-id: ea5cc2020fb2f65e6c2d7d6317de0dadba16d2db [formerly 57d4eacbb5]
Former-commit-id: 659a009c00
 2012-09-25 10:26:58 -05:00
Steve Harris
60ef7d29e0 12.10.1-6 baseline 
Former-commit-id: dd922048c0 [formerly 81d91a8289] [formerly cebe6534ae] [formerly dd922048c0 [formerly 81d91a8289] [formerly cebe6534ae] [formerly ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]]
Former-commit-id: ba648f8e72
Former-commit-id: d5ec4edea1 [formerly 0e77eb2fe2] [formerly e2eff41ad429447d5c80be0157ac1ea818d306fa [formerly 5d5a61bd75]]
Former-commit-id: ca8586dbe32865ad7ca07ad5a47da5d57ccd01ad [formerly e39023bb85]
Former-commit-id: 20732fcbd5
 2012-09-25 10:14:23 -05:00
Max Schenkelberg
ae84e87fc0 Issue #1192 Changed rename dialog to allow specifying a directory path along with the new file name. Made so directories can be attempted to be deleted as well. Cleaned up FileTreeView code so directory and file deletions show up in tree correctly 
Change-Id: I3080a03fcbed0de39908945d899e0c8200c2dc9a

Former-commit-id: 96d8ddcf51 [formerly 7a53736cf3] [formerly 22be9bee2e] [formerly 96d8ddcf51 [formerly 7a53736cf3] [formerly 22be9bee2e] [formerly adbeffbb25 [formerly 22be9bee2e [formerly 5397776e07902b1deb68259128ae536fafa1d844]]]]
Former-commit-id: adbeffbb25
Former-commit-id: 64d3ed2723 [formerly 03146b0a16] [formerly 8e6f528a102b2a018db31f4d1dddc50e51d23e89 [formerly ab58fcb601]]
Former-commit-id: 1807808e57851b0545ae309aff64b99242e04a59 [formerly 4b2023b359]
Former-commit-id: 8a68ac417e
 2012-09-24 11:33:03 -05:00
David Gillingham
b0606e6d25 Issue #1190: Replace all calls to WsId.getNetworkId().getHostName() with calls to WsId.getHostName() 
which uses new host name cache.

Change-Id: I7e6cab90d449732df807fb273b117da63de0a611

Former-commit-id: 5ec52e8a92 [formerly 414bb05da6] [formerly eca0d00313] [formerly 5ec52e8a92 [formerly 414bb05da6] [formerly eca0d00313] [formerly 8f532d2900 [formerly eca0d00313 [formerly bd8cd6a08b1a2db61d75cc822ec3541279416e0d]]]]
Former-commit-id: 8f532d2900
Former-commit-id: c3dd54de22 [formerly ca6c1bdeec] [formerly 00a220480415d7e00b76aa595a61ec10d341b9f2 [formerly 03d5b9e7f9]]
Former-commit-id: 52187b7006016b6ea26c3d4698d4854bce59880a [formerly 1a4d07ad87]
Former-commit-id: c7085ff04c
 2012-09-20 10:52:00 -05:00
Nate Jensen
a6ffce9c83 Merge "Issue #1091 Added localMaps.py capability" into development 
Former-commit-id: 0dec8c75c9 [formerly d0fa730f08] [formerly 998b7fc209] [formerly 0dec8c75c9 [formerly d0fa730f08] [formerly 998b7fc209] [formerly c1defed68e [formerly 998b7fc209 [formerly 05bf20edb5d43f2a78af0ce8a7c595226ca4cd43]]]]
Former-commit-id: c1defed68e
Former-commit-id: 8b8b2bc6d8 [formerly 2939da32d7] [formerly b61329311a0efe06e0e2d95f90a69604713c611d [formerly c9269ed3d0]]
Former-commit-id: 39adcee6ac150422d0b0c5536cebc8626a0903d1 [formerly 7bac64faf6]
Former-commit-id: 6c01684d8e
 2012-09-19 17:45:26 -05:00
Ron Anderson
fb457a2274 Issue #1091 Added localMaps.py capability 
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

Former-commit-id: 28efe7e4d6 [formerly dbe4f8f9b8] [formerly 6e2130a790] [formerly 28efe7e4d6 [formerly dbe4f8f9b8] [formerly 6e2130a790] [formerly 776214bf24 [formerly 6e2130a790 [formerly 21db6a603d237716744d7cac93482c9a51952403]]]]
Former-commit-id: 776214bf24
Former-commit-id: 5d6911f931 [formerly f5463c2e83] [formerly ce627290c20dc07d9b98e24e92ec594b3262f299 [formerly e917b45f38]]
Former-commit-id: 8bb619723c08949aabd1cee2270fe47f033fb0ea [formerly af7cac638e]
Former-commit-id: 43f30abdf3
 2012-09-19 17:41:48 -05:00
Bryan Kowal
dafa1ef660 Issue #1148 - the resources used by the gfesuite component in CAVE are now configurable. 
Change-Id: Id0d2ae388ddd7c4a27c4fbae19de9c53ae8b718d

Former-commit-id: 5884124ad4 [formerly fef603df01] [formerly e0eeb865a1] [formerly 5884124ad4 [formerly fef603df01] [formerly e0eeb865a1] [formerly 59dba27c24 [formerly e0eeb865a1 [formerly 73e4cd41a465984eeba2dbf8d52be3682624a27d]]]]
Former-commit-id: 59dba27c24
Former-commit-id: 123ab64bf5 [formerly 6068e5ee89] [formerly 2de8c75e4cf5ddd357f8007d65b16a0865a1ccfb [formerly 66db0593fe]]
Former-commit-id: 38bfb8565753da26fc548b3879e0e8a56763cb5e [formerly 8310e9ebc9]
Former-commit-id: 5379fa670d
 2012-09-19 10:55:59 -05:00
David Gillingham
9ed30526c3 Issue #1117: Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections. 
Change-Id: I7341de07e986227f0917191626cdff8e25bafa30

Former-commit-id: 3b7e2b3627 [formerly f14efdfd7b] [formerly cd1acff953] [formerly 3b7e2b3627 [formerly f14efdfd7b] [formerly cd1acff953] [formerly a6d5f67f7a [formerly cd1acff953 [formerly 82a37521333d6cb471d9d770f99ba593a9ce76aa]]]]
Former-commit-id: a6d5f67f7a
Former-commit-id: b3f97a70b7 [formerly c7f3c50a35] [formerly 9eca90d25acea37355c1a256a17e5cbef460f23d [formerly 4a2ebe8218]]
Former-commit-id: abc42c9ef3b1e6c10c78648481828dac6e643d55 [formerly 9c0d31db01]
Former-commit-id: d8e181911e
 2012-09-14 10:50:44 -05:00
David Gillingham
d10b8b964d Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo 
XML files, modify ParameterInfo to provide list of valid levels for each
parameter, create utility script to convert A1 CDL to A2 XML format,
modify WeatherElementBrowser so database lists are always current.

Change-Id: If0513ed8ce8c1134e92c6702c58b2a49f17a6dc5

Former-commit-id: 4d7f324f64 [formerly 03a202134a] [formerly 21739d1d38] [formerly 4d7f324f64 [formerly 03a202134a] [formerly 21739d1d38] [formerly 99ab0a124b [formerly 21739d1d38 [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]]]
Former-commit-id: 99ab0a124b
Former-commit-id: a048dee4b3 [formerly 28ade875c5] [formerly cfc850e4fc58538a74d0f8c0490660cc9d30f0f8 [formerly 964927b19d]]
Former-commit-id: da7d3be134a3c74fcdb1e41cda076543ccedbfc9 [formerly 527a457e55]
Former-commit-id: dcc5c7789d
 2012-09-13 15:39:58 -05:00
Steve Harris
12c59e82df Merge branch 'ss_builds' (12.10.1-4) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9d1f595fe6 [formerly e23b030dfd] [formerly 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6]]
Former-commit-id: bd0ee0b429fad620ecf3eac1dfa68366ef64350e [formerly f80fb62837]
Former-commit-id: 30b0700044
 2012-09-13 13:26:13 -05:00
Steve Harris
ed04125cd7 12.10.1-4 baseline 
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
 2012-09-13 12:08:11 -05:00
Steve Harris
e78abbb503 Merge branch 'ss_builds' (12.10.1-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
	cave/com.raytheon.uf.viz.kml.export.feature/build.properties
	cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
	cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
	cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment

Former-commit-id: 2f57e328fe [formerly f94db138cd] [formerly 64d4e2bded] [formerly 2f57e328fe [formerly f94db138cd] [formerly 64d4e2bded] [formerly 012c526816 [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]]
Former-commit-id: 012c526816
Former-commit-id: 047003d8c0 [formerly b14d30591b] [formerly bf5ba423a5556426548660494a7905779f996b28 [formerly 41c82361f7]]
Former-commit-id: 585e00c89332757d4df66cf4a92879c20bf9d63b [formerly bba73380ca]
Former-commit-id: 3bec22460f
 2012-09-11 16:57:03 -05:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline 
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
 2012-09-11 16:00:38 -05:00
Steve Harris
4ccea19158 12.10.1-2 baseline 
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee]
Former-commit-id: 5684a84a46
 2012-09-11 15:50:57 -05:00
Ron Anderson
a457539c80 Issue #1144 Fixed sizing of Local Effects Area dropdown. 
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5

Former-commit-id: 88ba04e791 [formerly 8ca431ab8b] [formerly ee7985bd57] [formerly 88ba04e791 [formerly 8ca431ab8b] [formerly ee7985bd57] [formerly 16260530e9 [formerly ee7985bd57 [formerly 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5]]]]
Former-commit-id: 16260530e9
Former-commit-id: 064d7a2afc [formerly e0e3e4a044] [formerly 22524cf34987f12d7db2178a5437262655f63666 [formerly 309196b6e1]]
Former-commit-id: b63148319d11f61113329e47c01d50715af7ae2f [formerly 86455f1e6a]
Former-commit-id: 8f85204091
 2012-09-06 17:44:00 -05:00
Steve Harris
46d05b60a1 Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]]
Former-commit-id: af106f1d29
Former-commit-id: 20e088a957 [formerly f224e3e8ad] [formerly fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]]
Former-commit-id: 3d9b8193220e5e34df1a2294f95f1fef387de77d [formerly e9582cb789]
Former-commit-id: f8e7459dfb
 2012-09-04 12:11:03 -05:00
Steve Harris
bc97cf788a 12.10.1-1 baseline 
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9]
Former-commit-id: a924a8347a
 2012-09-04 12:07:27 -05:00
Steve Harris
e38cbf019b 12.9.1-12 baseline 
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]]
Former-commit-id: 150bc967a5
Former-commit-id: 15fa63819d [formerly 782941ccc1] [formerly 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e]]
Former-commit-id: 636b0752d8e9909d3f1d52f3fb2dd51e26dcd63d [formerly 38aa573545]
Former-commit-id: c1e601dc30
 2012-09-04 11:47:38 -05:00
Steve Harris
e4a69a14b7 Merge branch 'ss_builds' (12.9.1-11) into development 
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]]
Former-commit-id: 34cbde4124
Former-commit-id: a3a1864f56 [formerly ffe253196a] [formerly b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246]]
Former-commit-id: 0a6beb81edff0c6c84ef952189b7118ada94cdbd [formerly 5b4ee818b7]
Former-commit-id: b63855f152
 2012-08-30 14:40:34 -05:00
Steve Harris
cba4faf995 12.9.1-10 baseline 
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: c704490769 [formerly f43a5af47f] [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]]
Former-commit-id: 8b8bb30a759783a20d278f5fb0049d2db76cb8dc [formerly 5bb474d33c]
Former-commit-id: ede38c4b3f
 2012-08-30 14:28:27 -05:00
Matt Nash
1071ff2049 Issue #1101 fix gfe keybindings for frame change in collaboration 
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: 04ce96d74e [formerly ba698ae69a] [formerly 018f590c70] [formerly 04ce96d74e [formerly ba698ae69a] [formerly 018f590c70] [formerly ada6ecf5f3 [formerly 018f590c70 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]]]
Former-commit-id: ada6ecf5f3
Former-commit-id: d35027f45e [formerly cac1c2bb2e] [formerly 5dd2067f359bb03dbe5cae64c69ba82ef563a1de [formerly 1242054a50]]
Former-commit-id: c580f22bd8cf1f202bf9fa6adf36dc991f847cf9 [formerly 5c568beda7]
Former-commit-id: 1b9d645810
 2012-08-27 12:16:38 -05:00
Steve Harris
7f13d82b95 Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development 
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]]
Former-commit-id: a71dac6cad
Former-commit-id: fd6e8d5b63 [formerly dbcb28ce77] [formerly 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]]
Former-commit-id: 8e63ec5399842340c4f27680b2ed51ba425ae251 [formerly 0b647c0c9d]
Former-commit-id: 3f44e46a6f
 2012-08-27 09:53:55 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline 
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
 2012-08-21 15:27:03 -05:00
Ron Anderson
fd53117c14 Issue #436 Made hazardDict an OrderedDict so order of entries is preserved. 
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.

Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff

Former-commit-id: 0a6de388dd [formerly 16231374f8] [formerly d7a818fd1d] [formerly 0a6de388dd [formerly 16231374f8] [formerly d7a818fd1d] [formerly 7662d249ab [formerly d7a818fd1d [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]]
Former-commit-id: 7662d249ab
Former-commit-id: 21b48541c3 [formerly 6e3674f9fc] [formerly eadb27af146fe75ce647766fdd43f9aa8948307f [formerly d3693827a1]]
Former-commit-id: cc064445b1277a5893829a9d2679defa8d74bab9 [formerly 1b655b0826]
Former-commit-id: f69d7b9c64
 2012-08-17 12:41:49 -05:00
Ron Anderson
c1d0cbae01 Issue #436 merging elevation base changes into branch off of development baseline. 
Former-commit-id: c71ee18e6e [formerly 93c632c1ff] [formerly 1321db6a99] [formerly c71ee18e6e [formerly 93c632c1ff] [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]]
Former-commit-id: 819b9c8e56
Former-commit-id: 0a32c7c683 [formerly e5952c1c99] [formerly 5cae0d5653a03ef5095386e62d4e0139bdd634e9 [formerly 6eafdda705]]
Former-commit-id: e27e7df534ee0ecbb93248c7bad66447e0b16b5e [formerly f7b9190b51]
Former-commit-id: b78c280ac8
 2012-08-17 12:20:08 -05:00
root
73466bae44 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
 2012-08-15 22:15:20 +00:00