Commit graph

7653 commits

Author SHA1 Message Date
Roger Ferrel
0ebb05b5c7 Omaha #3658 Scale arrows and use consistent units.
Change-Id: I7a627b015d2806e8456dd77e0eae679bbd370899

Former-commit-id: 64b8d193f4 [formerly faea9e0ddc [formerly 5d91f976af] [formerly 64b8d193f4 [formerly 0f0eafd8687edc0c10ef21495175f1e68f926577]]]
Former-commit-id: faea9e0ddc [formerly 5d91f976af]
Former-commit-id: faea9e0ddc
Former-commit-id: bc889a1b6b
2014-12-05 11:54:27 -06:00
Bryan Kowal
f08b3d88e1 Omaha #3508 - remove references to yajsw in %files
Former-commit-id: 9e77b9635e [formerly 16a33efd8b [formerly 9e55db1c52] [formerly 9e77b9635e [formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]]
Former-commit-id: 16a33efd8b [formerly 9e55db1c52]
Former-commit-id: 16a33efd8b
Former-commit-id: 121f1068ca
2014-12-05 10:04:42 -06:00
Bryan Kowal
bc21d253af Omaha #3508 - fix deploy-install for yajsw.
Former-commit-id: 90f15ff22c [formerly 4827d5b8fc [formerly 0d773ebd42] [formerly 90f15ff22c [formerly 75cf2b3e03ad446408c3d201e6e36bde5f1095f2]]]
Former-commit-id: 4827d5b8fc [formerly 0d773ebd42]
Former-commit-id: 4827d5b8fc
Former-commit-id: 4b1e4c4604
2014-12-05 09:38:47 -06:00
Bryan Kowal
0f1c84b46e Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: 48ec32e595 [formerly 289689e774 [formerly 19f6551c88] [formerly 48ec32e595 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]
Former-commit-id: 289689e774 [formerly 19f6551c88]
Former-commit-id: 289689e774
Former-commit-id: 4aaf636e18
2014-12-05 09:20:23 -06:00
Greg Armendariz
5177b2f98e Merge "Omaha #3836 - initial commit of the groovy-based developer deployment." into omaha_14.4.1
Former-commit-id: d2691afb97 [formerly 6764a49df5 [formerly d1ba788a61] [formerly d2691afb97 [formerly 4edea3f19307e0aeb100e8fe21852994baef9c94]]]
Former-commit-id: 6764a49df5 [formerly d1ba788a61]
Former-commit-id: 6764a49df5
Former-commit-id: 2d46a1d453
2014-12-05 08:57:51 -06:00
Greg Armendariz
365dbb4d4f Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
Former-commit-id: 610f38e9ef [formerly f6f50778c7 [formerly 8803a6b658] [formerly 610f38e9ef [formerly 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23]]]
Former-commit-id: f6f50778c7 [formerly 8803a6b658]
Former-commit-id: f6f50778c7
Former-commit-id: 1a012a8f2f
2014-12-05 08:57:37 -06:00
Greg Armendariz
690939f722 Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1
Former-commit-id: ed42ecc0e8 [formerly 73e48f7b1d [formerly 83ca3b5381] [formerly ed42ecc0e8 [formerly f310e13350ba8e64e313d99a7d03d0ef3cdc6aba]]]
Former-commit-id: 73e48f7b1d [formerly 83ca3b5381]
Former-commit-id: 73e48f7b1d
Former-commit-id: 7bced64c28
2014-12-05 08:57:08 -06:00
Greg Armendariz
c1ef3eb43c Merge "Omaha #3216 - update postgres to use geos 3.4.2" into omaha_14.4.1
Former-commit-id: 180a1cb4f2 [formerly ac92e7a1fd [formerly de088ca65b] [formerly 180a1cb4f2 [formerly e524cc13694ea30fdb7ab1d8879218be4650fed6]]]
Former-commit-id: ac92e7a1fd [formerly de088ca65b]
Former-commit-id: ac92e7a1fd
Former-commit-id: 06b0bc78e4
2014-12-05 08:46:03 -06:00
Nate Jensen
641a02cac5 Omaha #3015 correct usage of Coordinate(lon, lat)
Change-Id: I30029df3e963ee16e2612d5e9f29e7a0ca05a7a8

Former-commit-id: 4a934687aa [formerly a4db5e625f [formerly 0c59decfc3] [formerly 4a934687aa [formerly 67c3f28fa0edf3aa41726c6a9d2f18b5af586ab1]]]
Former-commit-id: a4db5e625f [formerly 0c59decfc3]
Former-commit-id: a4db5e625f
Former-commit-id: f1cfb3282f
2014-12-04 19:05:38 -06:00
Bryan Kowal
8f23ca3ec3 Omaha #3508 - purge non-centralized yajsw distributions
amend: ensure edex is dependent on yajsw

Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55

Former-commit-id: 0894efaaa3 [formerly cf5353e368 [formerly 71cf313666] [formerly 0894efaaa3 [formerly 9b36754ca610887a17666ceff2a1540b958913b6]]]
Former-commit-id: cf5353e368 [formerly 71cf313666]
Former-commit-id: cf5353e368
Former-commit-id: 2d7a7eff76
2014-12-04 17:33:43 -06:00
David Gillingham
075b90e037 Omaha #3885: Fix build.
Change-Id: I753a13c74dfb4e477e6a342c28b4edaf18169b3f

Former-commit-id: 9c7eff77f6 [formerly 26b92860af [formerly b9fe617d57] [formerly 9c7eff77f6 [formerly ce395804bdc86e1ea485794a0af3f931c83f3cfa]]]
Former-commit-id: 26b92860af [formerly b9fe617d57]
Former-commit-id: 26b92860af
Former-commit-id: 9deccef957
2014-12-04 17:00:00 -06:00
Bryan Kowal
3ead49d98a Omaha #3508 - created the yajsw rpm
Former-commit-id: 127db6aaee [formerly a89e9d96b9 [formerly 8be5362dbd] [formerly 127db6aaee [formerly 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21]]]
Former-commit-id: a89e9d96b9 [formerly 8be5362dbd]
Former-commit-id: a89e9d96b9
Former-commit-id: d1ae8959d9
2014-12-04 16:26:55 -06:00
Bryan Kowal
426b5e0b37 Omaha #3836 - initial commit of the groovy-based developer deployment.
Please refer to the: build/deploy.edex/ReadMe.txt

amend: remove files that are not used by the developer deployment

Change-Id: I7caaf61e88d315ea0d065d46036d3ba9530c29ec

Former-commit-id: 5b7f86d9d4 [formerly dc5cae7ea1 [formerly c963a90ce0] [formerly 5b7f86d9d4 [formerly d881ba5d55c41647e5b3c4dfecd7ea89ad7ec2eb]]]
Former-commit-id: dc5cae7ea1 [formerly c963a90ce0]
Former-commit-id: dc5cae7ea1
Former-commit-id: 1b120a763c
2014-12-04 16:17:53 -06:00
Ron Anderson
542f4f8b9d Merge "Omaha #3885: Merge VTEC route and request changes from VLab." into omaha_14.4.1
Former-commit-id: e0b9900a50 [formerly c4d27803cc [formerly d7e0d21d27] [formerly e0b9900a50 [formerly 401356d7917aaf84c5ea5c8f92ca32c270d5790a]]]
Former-commit-id: c4d27803cc [formerly d7e0d21d27]
Former-commit-id: c4d27803cc
Former-commit-id: 93bce63af0
2014-12-04 15:44:46 -06:00
Ron Anderson
12e6600e31 Merge "Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region." into omaha_14.4.1
Former-commit-id: 1a26141b89 [formerly 95df807187 [formerly d19865d5d1] [formerly 1a26141b89 [formerly 518b6de2a22f8ce80ee90f16fb8bf387e428909f]]]
Former-commit-id: 95df807187 [formerly d19865d5d1]
Former-commit-id: 95df807187
Former-commit-id: 13412b6c23
2014-12-04 13:55:24 -06:00
Nate Jensen
6b6b5639b8 Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
Former-commit-id: 13bd914319 [formerly 8f0375f71e [formerly 47b8be5b09] [formerly 13bd914319 [formerly 84412d1185073ed35278a40150b04845c8a98de3]]]
Former-commit-id: 8f0375f71e [formerly 47b8be5b09]
Former-commit-id: 8f0375f71e
Former-commit-id: ca2a11c31a
2014-12-04 13:24:19 -06:00
Roger Ferrel
6c36c95dc6 Omaha #3866 Added GFS20 to gfe. Latest changes to Pacific region.
Change-Id: I2c12259947289efaa5ce03be7adce42cdca0a28a

Former-commit-id: 597fdb8280 [formerly 24c969a249 [formerly 462e0d85c0] [formerly 597fdb8280 [formerly 46d3bbcc99d93845dcb159012b872fe746756b7c]]]
Former-commit-id: 24c969a249 [formerly 462e0d85c0]
Former-commit-id: 24c969a249
Former-commit-id: 9987f2c6b0
2014-12-04 12:52:22 -06:00
Fay.Liang
72d9708c0e Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: f5095bed4e [formerly 6e9ff9e139 [formerly 028d6bdc33] [formerly f5095bed4e [formerly ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963]]]
Former-commit-id: 6e9ff9e139 [formerly 028d6bdc33]
Former-commit-id: 6e9ff9e139
Former-commit-id: 7aaf379e07
2014-12-04 13:47:03 -05:00
Fay.Liang
c174ee4a96 Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 19194e0aa3 [formerly f327b9dd5a [formerly 83a4987188] [formerly 19194e0aa3 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]]
Former-commit-id: f327b9dd5a [formerly 83a4987188]
Former-commit-id: f327b9dd5a
Former-commit-id: 07316a588b
2014-12-04 13:46:31 -05:00
Nathan Bowler
5cef7a0899 Omaha #3848 Fix cancelling geotiff import.
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463

Former-commit-id: e1af24d84e [formerly a5bc553461 [formerly 3e7a1993e3] [formerly e1af24d84e [formerly 4c64044de959e709cd00da40826b916a579c44fe]]]
Former-commit-id: a5bc553461 [formerly 3e7a1993e3]
Former-commit-id: a5bc553461
Former-commit-id: 59e20e1f02
2014-12-04 13:24:04 -05:00
Greg Armendariz
0ae3102e52 Omaha #3216 - update postgres to use geos 3.4.2
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b

Former-commit-id: 1b1064d541 [formerly 515aa32cc6 [formerly 6dd90bb25a] [formerly 1b1064d541 [formerly 453247c7731adb5e1ca4e58306d14715c0f3a350]]]
Former-commit-id: 515aa32cc6 [formerly 6dd90bb25a]
Former-commit-id: 515aa32cc6
Former-commit-id: 89f89f1abc
2014-12-04 11:34:45 -06:00
Nate Jensen
588faa4976 Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
Former-commit-id: d4ce4aab6b [formerly 7fe0fc4cb9 [formerly cc41245a73] [formerly d4ce4aab6b [formerly 96183baeadd2dcfdc4a1dd0e9199b728f49209bf]]]
Former-commit-id: 7fe0fc4cb9 [formerly cc41245a73]
Former-commit-id: 7fe0fc4cb9
Former-commit-id: fd10e49ab8
2014-12-04 11:28:01 -06:00
Bruce.Hundermark
c5058a87bf ASM #631 - GFE: smartInit file baseline error with LAPS sky cover
Change-Id: Ice58a2e695e91efacb4adb39d47af50dd7bb6d78

Former-commit-id: f89ff6da89 [formerly 996854ae7f [formerly e1e453138f] [formerly f89ff6da89 [formerly de639a90c9858e2d85ccfbbc7dba8bee6c0380be]]]
Former-commit-id: 996854ae7f [formerly e1e453138f]
Former-commit-id: 996854ae7f
Former-commit-id: 7bba7445ff
2014-12-04 16:46:09 +00:00
Mark Peters
d3d6adcda5 Omaha #3709 Support foreground/background colors by user for group chats without shared display
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa

Former-commit-id: 7ae71cf1dc [formerly 1b30658214 [formerly bd3ed3935c] [formerly 7ae71cf1dc [formerly 73d8510ef265b47d2d45f36be3609ef8f35ece12]]]
Former-commit-id: 1b30658214 [formerly bd3ed3935c]
Former-commit-id: 1b30658214
Former-commit-id: 9006dbbb47
2014-12-04 10:37:53 -06:00
Ron Anderson
5b2dff8f7c Omaha #3885: Merge VTEC route and request changes from VLab.
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.

Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9

Former-commit-id: 2417d5a2a7 [formerly fd25fe9efc [formerly 5169e7181f] [formerly 2417d5a2a7 [formerly 16e32018de233fb128a7518415b84e032074932f]]]
Former-commit-id: fd25fe9efc [formerly 5169e7181f]
Former-commit-id: fd25fe9efc
Former-commit-id: 285330ccd0
2014-12-04 10:01:18 -06:00
Bruce.Hundermark
24ed30ef8e ASM #645 - GFE: CarSnowAmt smart tool can return incorrect amount
Change-Id: I8aea3ab2ccfec7e411e605ddfdfeef0a823687c2

Former-commit-id: c11898f30a [formerly c4ca149d67 [formerly 6f73b491f8] [formerly c11898f30a [formerly 25f4c8acdd8975d3001528212cbc7617cfd39500]]]
Former-commit-id: c4ca149d67 [formerly 6f73b491f8]
Former-commit-id: c4ca149d67
Former-commit-id: 9e59b79fbb
2014-12-04 15:56:01 +00:00
Richard Peter
2a135bc3e6 Merge "Omaha #3549 remove jdt prefs for faster builds" into omaha_14.4.1
Former-commit-id: d03177a68a [formerly e7b3f59131 [formerly cdb38349fb] [formerly d03177a68a [formerly b9afcd679acd000742ad31944b234118b6973946]]]
Former-commit-id: e7b3f59131 [formerly cdb38349fb]
Former-commit-id: e7b3f59131
Former-commit-id: 5e93e6062c
2014-12-04 09:45:48 -06:00
Nate Jensen
4d3eaebfb3 Omaha #3549 fix developer deploy
Change-Id: I6905a40f421df5f35688c90528e5731b7bb0d8dd

Former-commit-id: 99fa52c311 [formerly 36d8702286 [formerly 0ffdb0ff98] [formerly 99fa52c311 [formerly a713b9c70f48995fa52fc76a4d6db8712e3257e7]]]
Former-commit-id: 36d8702286 [formerly 0ffdb0ff98]
Former-commit-id: 36d8702286
Former-commit-id: 87355cf5ee
2014-12-04 09:05:54 -06:00
Nate Jensen
a482b4c2ea Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 68973ea94c [formerly c4ffdbc7e8 [formerly 7fed5d8e25] [formerly 68973ea94c [formerly 0a84cfa53c5565f3bf598b21aa5a7d71bc012543]]]
Former-commit-id: c4ffdbc7e8 [formerly 7fed5d8e25]
Former-commit-id: c4ffdbc7e8
Former-commit-id: 553898a1fa
2014-12-04 09:00:45 -06:00
Nate Jensen
d61334bf7a Omaha #3549 remove jdt prefs for faster builds
Change-Id: I3dc9ba8622a9312b29fb052ac0c95e87d808f9ec

Former-commit-id: 19cfdd12f4 [formerly 62dda63dab [formerly a8cfb57aef] [formerly 19cfdd12f4 [formerly 355f20818dc20b86de630e29cb18647c5878f118]]]
Former-commit-id: 62dda63dab [formerly a8cfb57aef]
Former-commit-id: 62dda63dab
Former-commit-id: 958d92ab83
2014-12-03 18:00:03 -06:00
Nate Jensen
659944f76a Omaha #3549 remove dead code
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2

Former-commit-id: 25e09348c0 [formerly cb745b34f3 [formerly 19d14b6107] [formerly 25e09348c0 [formerly 70209fbc92c5459dab007224e1f5783a5bb08fd0]]]
Former-commit-id: cb745b34f3 [formerly 19d14b6107]
Former-commit-id: cb745b34f3
Former-commit-id: 221a0950e8
2014-12-03 17:35:08 -06:00
Ben Steffensmeier
ef58a9806f Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 47d1ae9825 [formerly 8c69731c75 [formerly 65431db2c9] [formerly 47d1ae9825 [formerly 58946bb4ff319ac5c4c84e63268ec1149c9cede0]]]
Former-commit-id: 8c69731c75 [formerly 65431db2c9]
Former-commit-id: 8c69731c75
Former-commit-id: 6e49d2119e
2014-12-03 17:14:42 -06:00
Lee Venable
9a199e4d23 Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1
Former-commit-id: 5ab799b56f [formerly 8cb91f471b [formerly 3acfa2eda5] [formerly 5ab799b56f [formerly ab453bf60d663e731dcf273aeabf07472a061d90]]]
Former-commit-id: 8cb91f471b [formerly 3acfa2eda5]
Former-commit-id: 8cb91f471b
Former-commit-id: 2be6612609
2014-12-03 16:49:48 -06:00
Nate Jensen
8b40d8f44e Omaha #3549 remove dead code
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6

Former-commit-id: 1b4db26cd8 [formerly a651246f08 [formerly ac98f9730c] [formerly 1b4db26cd8 [formerly b597b4e3151d4e91b3e1db1a02135d33014850d8]]]
Former-commit-id: a651246f08 [formerly ac98f9730c]
Former-commit-id: a651246f08
Former-commit-id: b43ff910d5
2014-12-03 16:21:10 -06:00
Nate Jensen
e291bd932f Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 6c1391e938 [formerly ec28d2f1a0]
Former-commit-id: 6c1391e938
Former-commit-id: effb6c68bf
2014-12-03 15:47:10 -06:00
Nate Jensen
cb3467c827 Omaha #3549 fix frozen time sizing
Change-Id: I5f17f3bb840d689e8bdba1b52971287cf7279141

Former-commit-id: d26ba30c88 [formerly 5b7fd51d75 [formerly e78c319329] [formerly d26ba30c88 [formerly 5d4601f7c15323a9f926a325656843e5092e23bb]]]
Former-commit-id: 5b7fd51d75 [formerly e78c319329]
Former-commit-id: 5b7fd51d75
Former-commit-id: a51e2c9b5a
2014-12-03 14:29:52 -06:00
Nate Jensen
e7a19e1eec Merge "Omaha #3831 Alleviate memory usage in Template creation Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2" into omaha_14.4.1
Former-commit-id: 3b0fdec2e5 [formerly bb05069c21 [formerly 55817ea845] [formerly 3b0fdec2e5 [formerly 306c64193d02d065bba1c792e13aa34bafb6e9c3]]]
Former-commit-id: bb05069c21 [formerly 55817ea845]
Former-commit-id: bb05069c21
Former-commit-id: 2ec31cbae9
2014-12-03 14:14:36 -06:00
Juliya Dynina
eb52103a0f Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
Former-commit-id: 354a421da7 [formerly d49e57a971 [formerly c431691d06] [formerly 354a421da7 [formerly 2ebcc016732b0405b183b0e4e56d528a24e9cbdf]]]
Former-commit-id: d49e57a971 [formerly c431691d06]
Former-commit-id: d49e57a971
Former-commit-id: 96f5d1719e
2014-12-03 14:40:12 -05:00
Dave Hladky
bd2ed5a659 Omaha #3831 Alleviate memory usage in Template creation
Change-Id: Iab5c75280d5b2fd14f12ef14e148d3c6bfaf85c2

Former-commit-id: 45ebc9cd05 [formerly 53d1b4a0c3 [formerly 3c2f18f454] [formerly 45ebc9cd05 [formerly dd40b635fa20789be1f4a8502530e00f264c7966]]]
Former-commit-id: 53d1b4a0c3 [formerly 3c2f18f454]
Former-commit-id: 53d1b4a0c3
Former-commit-id: 641eff08d2
2014-12-03 12:39:04 -06:00
steve.naples
85381488d5 ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4

Former-commit-id: b5389ced26 [formerly 91c240f8bd [formerly c4fad58bd9] [formerly b5389ced26 [formerly 862cb7c4d789915067558c4508cf5f1e45a2cdf2]]]
Former-commit-id: 91c240f8bd [formerly c4fad58bd9]
Former-commit-id: 91c240f8bd
Former-commit-id: a281a43536
2014-12-03 18:35:19 +00:00
Sarah Pontius
83416ad9b3 VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565

Former-commit-id: 5d696b412d [formerly 2b37fe2994 [formerly 171a802190] [formerly 5d696b412d [formerly 24c01f47449607347812e0e676f1d14849d3b47e]]]
Former-commit-id: 2b37fe2994 [formerly 171a802190]
Former-commit-id: 2b37fe2994
Former-commit-id: 5bc5175729
2014-12-03 11:19:06 -07:00
Zihou Wang
79169ceeea VLab Issue #5502 - DR_16767 Add hail size classes; fixes #5502
Change-Id: I7ed71f7cc7d14263bd233e289bd6b0c9febe140b

Former-commit-id: df4179f936 [formerly 6977a174ac [formerly cbc28219f3] [formerly df4179f936 [formerly 249cd9b14341bc96a255fabe33abd44c8433e39d]]]
Former-commit-id: 6977a174ac [formerly cbc28219f3]
Former-commit-id: 6977a174ac
Former-commit-id: 407732dd66
2014-12-03 16:24:55 +00:00
David Friedman
5db0fbd81b ASM #16829 - TextWS: Problem with AlarmAlertFunctions static class initialization
Change-Id: I8e2cbe627942570a9544d21cd41b09701d65fccf

Former-commit-id: 5164b85f2f [formerly 756359ea4b [formerly 7fb946e4b8] [formerly 5164b85f2f [formerly e2ab243f69cc96248284f78bbcd3c83f57f23b6d]]]
Former-commit-id: 756359ea4b [formerly 7fb946e4b8]
Former-commit-id: 756359ea4b
Former-commit-id: d37640846d
2014-12-03 15:55:20 +00:00
David Friedman
51a87fe226 ASM #16859 - Text decoder processes collectives inefficiently
Change-Id: Ib38ca77d66eccc84b7ffb64901b2eef64ee82af4

Former-commit-id: 47f151fe85 [formerly 71570b1360 [formerly 61e3f4493a] [formerly 47f151fe85 [formerly dac7434202e9d5b5aafc4784f6a9201b5a9f0394]]]
Former-commit-id: 71570b1360 [formerly 61e3f4493a]
Former-commit-id: 71570b1360
Former-commit-id: 9dd16b1b71
2014-12-03 15:44:27 +00:00
Lee Venable
ed22988619 Merge "Omaha #3841 - Updated the dialogs for adding and editing a new zone/station." into omaha_14.4.1
Former-commit-id: 7aba701fdd [formerly d43c20b408 [formerly 18e8976193] [formerly 7aba701fdd [formerly d4e460721777642fed02c3bdd8cc49964ba2b4ba]]]
Former-commit-id: d43c20b408 [formerly 18e8976193]
Former-commit-id: d43c20b408
Former-commit-id: ee3a45906d
2014-12-02 17:49:54 -06:00
Matthew Howard
1fc9423a3e Merge "ASM #625 - modify checkGroup() to display models in multiple columns if needed" into asm_14.4.1
Former-commit-id: 8261961462 [formerly 786cbef2ef [formerly 52d59a2bc9] [formerly 8261961462 [formerly 781b484eeec14113a120055595b4ac6528bbbf21]]]
Former-commit-id: 786cbef2ef [formerly 52d59a2bc9]
Former-commit-id: 786cbef2ef
Former-commit-id: dea2913fc7
2014-12-02 17:28:30 -05:00
Rici.Yu
ed6cc7f41d ASM #625 - modify checkGroup() to display models in multiple columns if needed
Change-Id: I94c5400d21b10b57cf08f4767a5160bfcc554eb9

Former-commit-id: 21e3e584b3 [formerly da032a4681 [formerly fb347e4a93] [formerly 21e3e584b3 [formerly 07c826efbcfe30dc3fc178601e550a6dbd31eb0b]]]
Former-commit-id: da032a4681 [formerly fb347e4a93]
Former-commit-id: da032a4681
Former-commit-id: 2bc651a84d
2014-12-02 17:05:56 -05:00
Bryan Kowal
a627d0ec37 Merge "Omaha #3216 - Increment pypies release number" into omaha_14.4.1
Former-commit-id: 59e79603c9 [formerly a75f02722e [formerly 79500123f1] [formerly 59e79603c9 [formerly 633b166d5986db5a8ddcd8ff801d5db6a7af203f]]]
Former-commit-id: a75f02722e [formerly 79500123f1]
Former-commit-id: a75f02722e
Former-commit-id: 1151c984a1
2014-12-02 15:45:37 -06:00
Nate Jensen
19ef3b649f Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 0211262227 [formerly 22d6b8ce65 [formerly 8bf1cdc69f] [formerly 0211262227 [formerly 0d05a028c3137cf7b1b289e403e58c006ada7d3c]]]
Former-commit-id: 22d6b8ce65 [formerly 8bf1cdc69f]
Former-commit-id: 22d6b8ce65
Former-commit-id: 4362ae4d9e
2014-12-02 15:25:58 -06:00
Juliya Dynina
df3ac0a560 Merge "ASM #643 - Text Workstation mishandles editing WRK products with numbers in PIL." into asm_14.4.1
Former-commit-id: 69cb7d2b59 [formerly 8614eccfc4 [formerly ecff60b24a] [formerly 69cb7d2b59 [formerly 80b63dcc4e0d2c87eeb7ca4502fcc97be0ab09a6]]]
Former-commit-id: 8614eccfc4 [formerly ecff60b24a]
Former-commit-id: 8614eccfc4
Former-commit-id: ad6d0dacd7
2014-12-02 15:54:54 -05:00