Commit graph

5125 commits

Author SHA1 Message Date
Nate Jensen
a533863850 Merge "Issue #2952 - Change MPE fieldgen to use thriftSrv" into development
Former-commit-id: 541cd059e8 [formerly 6e7b3d21a1] [formerly 8040bcd68d] [formerly 8040bcd68d [formerly 0b25f77fe8]] [formerly 541cd059e8 [formerly 6e7b3d21a1] [formerly 8040bcd68d] [formerly 8040bcd68d [formerly 0b25f77fe8]] [formerly 862d1de6c4 [formerly 8040bcd68d [formerly 0b25f77fe8] [formerly 862d1de6c4 [formerly 8efaad8250215b687ae9286358cdd30148cdc366]]]]]
Former-commit-id: 862d1de6c4
Former-commit-id: eae5e12b03 [formerly 427ded7bcf] [formerly e1a62c357f] [formerly c8b32567c0295e86866a23e7950be4f132598b7e [formerly aa40824139fb68908b53530f21471f11b8574ff6] [formerly e1a62c357f [formerly 2534fb0ab1]]]
Former-commit-id: c0d8e253f43289bc636e8d0ba3f8435f31c70c08 [formerly ba614ffc66271bad6ea9aa0bbd26d6d7c66e8869] [formerly c6a43bacfd [formerly f7baa0ee4b]]
Former-commit-id: c6a43bacfd
Former-commit-id: ec99d06e8a
2014-04-02 09:54:53 -05:00
Greg Armendariz
ce75cc4e1f Merge "Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds" into development
Former-commit-id: b839b31a45 [formerly d93b20052e] [formerly 28d399492b] [formerly 28d399492b [formerly 6b65575f3d]] [formerly b839b31a45 [formerly d93b20052e] [formerly 28d399492b] [formerly 28d399492b [formerly 6b65575f3d]] [formerly 60ffdf9ff2 [formerly 28d399492b [formerly 6b65575f3d] [formerly 60ffdf9ff2 [formerly d82ecf1319c5aee6d45fb7b42e8e757dcd6892ca]]]]]
Former-commit-id: 60ffdf9ff2
Former-commit-id: da1c76dd83 [formerly 522eea5741] [formerly 5624e78454] [formerly 677ff3e388dfef189f8d9ad2dee5d566f9aa017f [formerly 26a4b510ba6631318dbc21939b1785a44a6e2976] [formerly 5624e78454 [formerly eecea8bf4c]]]
Former-commit-id: 5e277e4d131e23d539304ec742a8d8d9c2207f9d [formerly d38d976d9461c26b83572ceb81d888be1870da0f] [formerly 6f7e5cc06a [formerly 0961a42a25]]
Former-commit-id: 6f7e5cc06a
Former-commit-id: e992418df6
2014-04-01 19:34:23 -05:00
Lee Venable
b3cb3d041a Issue #2979 - added dispose check to runAsync call.
Former-commit-id: 2a8039fe8d [formerly fed1709f40] [formerly 6a5754b403] [formerly 6a5754b403 [formerly c0d95865f2]] [formerly 2a8039fe8d [formerly fed1709f40] [formerly 6a5754b403] [formerly 6a5754b403 [formerly c0d95865f2]] [formerly 4a81165239 [formerly 6a5754b403 [formerly c0d95865f2] [formerly 4a81165239 [formerly d590cbe1508e1dfc1557e558a4a55aa7388e1d40]]]]]
Former-commit-id: 4a81165239
Former-commit-id: c54935a50e [formerly 1574e8a3b0] [formerly 3cf97272ca] [formerly a8632f4214c868e83a7ff517f5a56aa25e12282b [formerly e418656bdca96cb73e044ab17808764c7423d8c0] [formerly 3cf97272ca [formerly d97d0bc29d]]]
Former-commit-id: 8d62ec00fadc6afc6ba5191fab410e913b7a1646 [formerly 52c3d49dd15aee47a78d707f3244ef8d9e6f9054] [formerly dc378fc213 [formerly ae40345134]]
Former-commit-id: dc378fc213
Former-commit-id: 12711070be
2014-04-01 16:36:22 -05:00
Lee Venable
6ebe97dc71 Issue #2976 - added SWT widget dispose check in runAsync call.
Former-commit-id: 0b07da9c6f [formerly 9187c4ccf4] [formerly 311337f5fc] [formerly 311337f5fc [formerly 64905717e2]] [formerly 0b07da9c6f [formerly 9187c4ccf4] [formerly 311337f5fc] [formerly 311337f5fc [formerly 64905717e2]] [formerly e6c9f4870e [formerly 311337f5fc [formerly 64905717e2] [formerly e6c9f4870e [formerly 8617d57ea899877ba3f0149059a439d5dc60c5a2]]]]]
Former-commit-id: e6c9f4870e
Former-commit-id: cc57ab8028 [formerly 961c8cf1fa] [formerly 1eed6a7ec6] [formerly 86dadc019dfcdc6a407367773c9a9f8d01fd84a1 [formerly 98b1ee3341a955bdfd361a9c85746fc1e941720d] [formerly 1eed6a7ec6 [formerly d4279a4390]]]
Former-commit-id: 021e072e2972dbf19dc007d9f4f72b9321de0b83 [formerly 7dd30e6ee6bd30daa9a0a8e1e297f21196aa3374] [formerly d67cf5faee [formerly 4a04c52a3f]]
Former-commit-id: d67cf5faee
Former-commit-id: 6504ca5274
2014-04-01 11:19:41 -05:00
Nate Jensen
e6f1d5d76b Merge "Issue #2937 Separate room logging into a subdirectory to separate room logs from other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory for dependency jars so that symbolic links are not needed in order to build. Fixes for Archive log access and search." into development
Former-commit-id: c129d32b61 [formerly abc7cd02ff] [formerly 449b28f4b9] [formerly 449b28f4b9 [formerly 700269993a]] [formerly c129d32b61 [formerly abc7cd02ff] [formerly 449b28f4b9] [formerly 449b28f4b9 [formerly 700269993a]] [formerly a373345f6e [formerly 449b28f4b9 [formerly 700269993a] [formerly a373345f6e [formerly 4bcf4eac3618baa1d92c57b5984ff72ebf8d3dbc]]]]]
Former-commit-id: a373345f6e
Former-commit-id: 5e9b6b12da [formerly 43896bf040] [formerly 008f7693c9] [formerly 97ec54c7a0aa5d3f64f6226911fe2e936223c36f [formerly b059d767e05b95533bb39256f2380c2f1f0573f0] [formerly 008f7693c9 [formerly 93ca04828d]]]
Former-commit-id: 5542c8aa9870032e4e130daadb4c26f122d135ca [formerly b85886c8c094af6edab0711fd632353b155e1c00] [formerly 470bc1e14c [formerly 8e3eb67f21]]
Former-commit-id: 470bc1e14c
Former-commit-id: 82b6359359
2014-04-01 10:01:35 -05:00
Richard Peter
cd47141ad0 Merge "Issue #2906 added synoptic obs translation tables" into development
Former-commit-id: de9a0dc3f6 [formerly 317a4a179f] [formerly 349aa18226] [formerly 349aa18226 [formerly fba9ea7d0c]] [formerly de9a0dc3f6 [formerly 317a4a179f] [formerly 349aa18226] [formerly 349aa18226 [formerly fba9ea7d0c]] [formerly 45b4288379 [formerly 349aa18226 [formerly fba9ea7d0c] [formerly 45b4288379 [formerly 2bb81e87f7937e2223cb740ad56d2fb23d712cdf]]]]]
Former-commit-id: 45b4288379
Former-commit-id: 05aca11e5c [formerly a3820ecf07] [formerly 238b7c1b2d] [formerly 5452facb5bf854dc025f8e0ab83075cea1babdd4 [formerly 4ce44703a14c0b5ea5a9af32883b9a46fcd1269a] [formerly 238b7c1b2d [formerly 1be8d7b9fc]]]
Former-commit-id: c2219efc3c951cff78d46875518d34ab4d6ac3be [formerly 4ebfae0ad03b25cf57c8a36c52ad90d6ec158261] [formerly d1ca98b6fb [formerly 1ef216f23c]]
Former-commit-id: d1ca98b6fb
Former-commit-id: 78e2957024
2014-04-01 09:43:54 -05:00
Richard Peter
443976bd0a Merge "Issue #2791 Fix streamlines that were broken in conversion to data source." into development
Former-commit-id: f87ab02793 [formerly 472d4a213f] [formerly 584c8d2fc3] [formerly 584c8d2fc3 [formerly 609e574825]] [formerly f87ab02793 [formerly 472d4a213f] [formerly 584c8d2fc3] [formerly 584c8d2fc3 [formerly 609e574825]] [formerly e0af16feed [formerly 584c8d2fc3 [formerly 609e574825] [formerly e0af16feed [formerly 045e498e5d6a47bc35fc7d26b8d8b431dcd4b492]]]]]
Former-commit-id: e0af16feed
Former-commit-id: 4dbaf41623 [formerly cbd9ce9df3] [formerly 088b1ebcc0] [formerly 6fec0ba99b1ba5b034c8f8309c741ab4f572e38e [formerly 0b26cd285b56f196e8054113c3a18f6c2f904098] [formerly 088b1ebcc0 [formerly 42d745e515]]]
Former-commit-id: b04aead160bfac95ed431fbc55178a6a187928e1 [formerly b4807b261f95692bc1ddf8cb553d69e7f21499d6] [formerly 39bfdd51e8 [formerly 2e5f76bf21]]
Former-commit-id: 39bfdd51e8
Former-commit-id: d33e5c19a6
2014-04-01 09:38:23 -05:00
Nate Jensen
e054675682 Merge "Issue #2899 - Improve error messages." into development
Former-commit-id: c54f77aa54 [formerly 65f7ef9290] [formerly 651b40e423] [formerly 651b40e423 [formerly fe56feaa74]] [formerly c54f77aa54 [formerly 65f7ef9290] [formerly 651b40e423] [formerly 651b40e423 [formerly fe56feaa74]] [formerly b9aae5b0f2 [formerly 651b40e423 [formerly fe56feaa74] [formerly b9aae5b0f2 [formerly f24a44ac9db6d1f1339aeaf3f0071656847b0d36]]]]]
Former-commit-id: b9aae5b0f2
Former-commit-id: 1dd73ccc21 [formerly a6497bb55d] [formerly addd8031b1] [formerly 73d984e9028d01a67be12f7876b27850b0aa39b0 [formerly 253abdca80717dff3140bda2f1a2de3138cf2346] [formerly addd8031b1 [formerly b5461e0ddb]]]
Former-commit-id: e7c0f1ee6836d0a0512087ab9de1c6971f401a8c [formerly a13593d31c7ddd509c49b38021ad9b5c0148a63c] [formerly 37738c66af [formerly 71598c15ac]]
Former-commit-id: 37738c66af
Former-commit-id: 69dfc13be9
2014-04-01 08:46:25 -05:00
Lee Venable
23b7371032 Issue #2970 - added SWT dispose checks to runAsync methods.
Former-commit-id: 6710c28b78 [formerly bd8d4feea2] [formerly 91c1cc0e2a] [formerly 91c1cc0e2a [formerly 64f5da88ff]] [formerly 6710c28b78 [formerly bd8d4feea2] [formerly 91c1cc0e2a] [formerly 91c1cc0e2a [formerly 64f5da88ff]] [formerly 4714913a8c [formerly 91c1cc0e2a [formerly 64f5da88ff] [formerly 4714913a8c [formerly b07ebb73405c3421c6afa3e45db57162a7ca622b]]]]]
Former-commit-id: 4714913a8c
Former-commit-id: b3141acd0d [formerly 2cea1633be] [formerly b95ff2aa5c] [formerly ed82232856b4064d4f5fd3d67d7f12029051acae [formerly 399d430b6568ed3139d21a7f38ca7481ea493a92] [formerly b95ff2aa5c [formerly 198785dc0c]]]
Former-commit-id: ad485f1a6eb40f36ef924159d99ecaf2a5e85796 [formerly 7927179f7a36deb8cf780601cf1f82e254b59140] [formerly fa8e70f496 [formerly a6f051fe39]]
Former-commit-id: fa8e70f496
Former-commit-id: 420f016ce3
2014-03-31 16:06:59 -05:00
Mike Duff
5cf68eb8b4 Issue #2899 - Improve error messages.
Change-Id: Iba298e66d1b889fce8cde9103674c86558bd222c

Former-commit-id: f6fd3e0367 [formerly b1aae9256c] [formerly dc81b79eca] [formerly dc81b79eca [formerly bcdfd5a0c9]] [formerly f6fd3e0367 [formerly b1aae9256c] [formerly dc81b79eca] [formerly dc81b79eca [formerly bcdfd5a0c9]] [formerly d6ce901a3a [formerly dc81b79eca [formerly bcdfd5a0c9] [formerly d6ce901a3a [formerly e83da0adee12900da03cb4b273a90d13fc5fc327]]]]]
Former-commit-id: d6ce901a3a
Former-commit-id: 37f29faee8 [formerly 2b67428bb8] [formerly be5eeafeb7] [formerly 4337592aa2ad5a3d17720b852e012debc3d8c442 [formerly d9ffb6af27ebcb9dc33b400820eb8e9b7a36691a] [formerly be5eeafeb7 [formerly 6453a46d96]]]
Former-commit-id: b56fce06c3d2e4dca54b7be8742d313c5086d941 [formerly caeedf26817e21885f4777c70ac99b1ff9d095d5] [formerly d664eb9199 [formerly 3c5c496b81]]
Former-commit-id: 99b2706a7281339ac21238b54d17465188791938 [formerly d664eb9199]
Former-commit-id: 7d72dbb7b7
2014-03-31 16:01:44 -05:00
Mike Duff
f4fbf8c844 Issue #2952 - Change MPE fieldgen to use thriftSrv
Change-Id: Ibd0ed87582a6374db1e49bc66093705436f6d5d3

Former-commit-id: e779ceee40 [formerly 5d44d7d470] [formerly d1a705822c] [formerly d1a705822c [formerly 2cb92e6039]] [formerly e779ceee40 [formerly 5d44d7d470] [formerly d1a705822c] [formerly d1a705822c [formerly 2cb92e6039]] [formerly 235080c256 [formerly d1a705822c [formerly 2cb92e6039] [formerly 235080c256 [formerly 182b9f69c72332e73cdda26ebbebedb4abc059b0]]]]]
Former-commit-id: 235080c256
Former-commit-id: 318444a4aa [formerly f753a3bb03] [formerly 7bb2c5535a] [formerly 0a723d6b72adb8dae17b543092deaaef127523ba [formerly c7fdcb88f6d17b73071e2cd4f40334515c7187d6] [formerly 7bb2c5535a [formerly b4f0f5c5b0]]]
Former-commit-id: 4237e0e6454fea4d6f3edc7c945ea523fcdf8166 [formerly 542c7ee1b81bfc43f2f04c099d8dbc0cc0be2386] [formerly 579bc71968 [formerly fca3f85dca]]
Former-commit-id: 579bc71968
Former-commit-id: ab5fbf6116
2014-03-31 15:08:33 -05:00
Bryan Kowal
25e1e79ad7 Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds
Amend: remove generated files

Change-Id: I727391745ff9cbaaa1a3953567f909da1da01630

Former-commit-id: 0bbf1e2e40 [formerly 6c0f960c70] [formerly f790e255ff] [formerly f790e255ff [formerly 72a8f0406f]] [formerly 0bbf1e2e40 [formerly 6c0f960c70] [formerly f790e255ff] [formerly f790e255ff [formerly 72a8f0406f]] [formerly c9ee6a38d0 [formerly f790e255ff [formerly 72a8f0406f] [formerly c9ee6a38d0 [formerly 20e1e788dd5ca68497d5496586b30a8463dd0ca8]]]]]
Former-commit-id: c9ee6a38d0
Former-commit-id: 7c153b117c [formerly 00532f63ff] [formerly 12a0cf6185] [formerly 4f0f2dab44b7d8a950f7c6244ac317154c99664f [formerly 454c0c02b1d2b3c3e8be077dcbdb6f905ca46d42] [formerly 12a0cf6185 [formerly 5f2c5fb681]]]
Former-commit-id: 0ea33b6649ec91b9e04c68cf8c491e6822cdee18 [formerly c5478bfeecf31ebce381eac8454223f66b646315] [formerly 1f53abd09c [formerly f246fb0b97]]
Former-commit-id: 2f504df1a0b9106e610f5fa72bbc9e4b055306c7 [formerly 1f53abd09c]
Former-commit-id: f88323d260
2014-03-31 12:37:37 -05:00
Brian Clements
88630dd72b Issue #2906 added synoptic obs translation tables
created a command line utility to generate translation table starters
added synoptic table mapped values to bufr translation tables


Former-commit-id: a6aadde1b7 [formerly 3a29338902] [formerly 467cfe59d0] [formerly 467cfe59d0 [formerly f4361b78b6]] [formerly a6aadde1b7 [formerly 3a29338902] [formerly 467cfe59d0] [formerly 467cfe59d0 [formerly f4361b78b6]] [formerly 0fa7dfb7df [formerly 467cfe59d0 [formerly f4361b78b6] [formerly 0fa7dfb7df [formerly 7eb9def773f971d5dc0e43d8b191d2b864f290d2]]]]]
Former-commit-id: 0fa7dfb7df
Former-commit-id: b1607bc797 [formerly bfac7edb8d] [formerly 18d71c92ac] [formerly 060f376928f930e1083a3f80bbb87de9abff73bf [formerly 4ba927c05d23c15fec6ddc105f04d8fa7eea7509] [formerly 18d71c92ac [formerly a37eb5d142]]]
Former-commit-id: e763f50278f502800013e9ececd30ef65122ca23 [formerly 47625ffb0745baa87226feebc0be0641c34c286c] [formerly ab8f77b7ce [formerly a6240a83f6]]
Former-commit-id: ab8f77b7ce
Former-commit-id: 2b1239f7b0
2014-03-31 11:56:04 -05:00
Brad Gonzales
495cc358af Issue #2937 Separate room logging into a subdirectory to separate room logs from
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build.  Fixes for Archive log access
and search.

Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174

Former-commit-id: 2bf330935d [formerly 85911a9d01] [formerly d4659c48a6] [formerly d4659c48a6 [formerly 404faeeca0]] [formerly 2bf330935d [formerly 85911a9d01] [formerly d4659c48a6] [formerly d4659c48a6 [formerly 404faeeca0]] [formerly 15e1b7a7f6 [formerly d4659c48a6 [formerly 404faeeca0] [formerly 15e1b7a7f6 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: 40dc41ae6e [formerly c12c4cf7e2] [formerly 1c685a9eb6] [formerly ceb7ccb67ec42d2f0d020581bc76a1156c1ff415 [formerly f8fc71ad10a4d9dbd3464113660b2d2d68675fd5] [formerly 1c685a9eb6 [formerly 2f56fd3c9d]]]
Former-commit-id: c55c77ed104cc2dfe627b6c9074e4279771f8f00 [formerly 742e4cc46d2a1218def59e841a9507b8581e81ce] [formerly 5506e9362a [formerly 4940c40a7f]]
Former-commit-id: 5506e9362a
Former-commit-id: 2637e3c237
2014-03-31 11:45:22 -05:00
Mike Duff
814bc3adb2 Issue #2689 - Add input values to log statement on LL to HRAP conversion failure.
Fix error in HRAP overlay resource.

Change-Id: If6fcb23a839323e4541e8ff28c0d702bf3066273

Former-commit-id: 96f9193dc3 [formerly 43f7e3307a] [formerly d5c3ddcef8] [formerly d5c3ddcef8 [formerly be9cf109b1]] [formerly 96f9193dc3 [formerly 43f7e3307a] [formerly d5c3ddcef8] [formerly d5c3ddcef8 [formerly be9cf109b1]] [formerly 5f1f931c64 [formerly d5c3ddcef8 [formerly be9cf109b1] [formerly 5f1f931c64 [formerly ee88ab32961525d74a227cccec615c0610dc9525]]]]]
Former-commit-id: 5f1f931c64
Former-commit-id: 0db34fcdbf [formerly 5dd6bad115] [formerly c518a6710b] [formerly 0fbf7c7ca230fe174ab681f39f83cd07e894be9a [formerly e1dad5245b047c7e36a1a34a412afe2bccff0886] [formerly c518a6710b [formerly da5a3bf858]]]
Former-commit-id: ce0ab5ffa8da84230045d217bbb9317b72fa8a36 [formerly 939b0eca2c26d276830d997fe69b66abdf13e62b] [formerly b0a9b09f16 [formerly a007cb795c]]
Former-commit-id: b0a9b09f16
Former-commit-id: ef58a05e3f
2014-03-31 11:35:06 -05:00
Lee Venable
7dddbb922f Issue #2960 - added checks for SashForm weights
Former-commit-id: 5eb3a137a3 [formerly 0b8d762f4b] [formerly bdb18ea85b] [formerly bdb18ea85b [formerly 19dd95ba24]] [formerly 5eb3a137a3 [formerly 0b8d762f4b] [formerly bdb18ea85b] [formerly bdb18ea85b [formerly 19dd95ba24]] [formerly 3018ff1f5f [formerly bdb18ea85b [formerly 19dd95ba24] [formerly 3018ff1f5f [formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]]]]
Former-commit-id: 3018ff1f5f
Former-commit-id: 9cf5ea875e [formerly 5ffe5c01f6] [formerly f7e1ee666b] [formerly 3f34ee33a68191d1c2dea86866b50e70fe31fcbb [formerly 8994df39c007e35516677413a4a7d0c0f74e7bc6] [formerly f7e1ee666b [formerly 1504b3532e]]]
Former-commit-id: ee627da1b93ae293b4fb8e63efe70112e3a94eac [formerly 8b5260355b4e750a39f73f261eadbf55b49f4555] [formerly d1928c95d9 [formerly 5bbb65637e]]
Former-commit-id: d1928c95d9
Former-commit-id: 2644d48fc0
2014-03-28 15:30:11 -05:00
Nate Jensen
57cebc8e8f Issue #2015 fix NPP displaying in collaboration shared display sessions
Change-Id: Ie5e40d8ff3e7a222448777b86d188822e3990746

Former-commit-id: c98eb51509 [formerly befeb24d13] [formerly bd3e4659fb] [formerly bd3e4659fb [formerly 32ae6bfb63]] [formerly c98eb51509 [formerly befeb24d13] [formerly bd3e4659fb] [formerly bd3e4659fb [formerly 32ae6bfb63]] [formerly 1e0026e60f [formerly bd3e4659fb [formerly 32ae6bfb63] [formerly 1e0026e60f [formerly d4e2da7f81d5c3ad005f299c936bd2d70f05b17a]]]]]
Former-commit-id: 1e0026e60f
Former-commit-id: 01454e8124 [formerly 9e6da704d2] [formerly 175f26a005] [formerly 0d66876c7e7658edb56776f9539493cd49bc4082 [formerly a26d4fe2b0bedd830ce627e61d7d2847bf6111b4] [formerly 175f26a005 [formerly 3c75dd7364]]]
Former-commit-id: 0ca3e9a6b07e41ad997dff7c59b8a024094993da [formerly 1b97240589bc10d45a1f4bf3f500774435796596] [formerly a257e762f3 [formerly a46bc4333a]]
Former-commit-id: a257e762f3
Former-commit-id: 2314749d45
2014-03-28 09:56:59 -05:00
Nate Jensen
634bf697f1 Merge "Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions" into development
Former-commit-id: 6acbb3c12e [formerly 95710fff2a] [formerly a69165b4db] [formerly a69165b4db [formerly e7882b1409]] [formerly 6acbb3c12e [formerly 95710fff2a] [formerly a69165b4db] [formerly a69165b4db [formerly e7882b1409]] [formerly 5af9c9113c [formerly a69165b4db [formerly e7882b1409] [formerly 5af9c9113c [formerly 723d44e31b8aad30428a3c1fd024b05555b4e9af]]]]]
Former-commit-id: 5af9c9113c
Former-commit-id: 24ddcccfc5 [formerly b9a24788bc] [formerly 219be3e2e3] [formerly 9fe7e8e369872a84a91303bb3233a4e016f19cf9 [formerly 1196279dfcb99aa5ff7ca86319c6b157a1e5fc53] [formerly 219be3e2e3 [formerly ca19d00b1d]]]
Former-commit-id: 7c51d30cbf2df273867f127ccf66aa5c2f2a077a [formerly 04399542fb3cd59e9e4877f1d6c9c41c32332ddd] [formerly 6d34715e21 [formerly 582aa4c699]]
Former-commit-id: 6d34715e21
Former-commit-id: 22028c8e80
2014-03-27 17:25:55 -05:00
Mike Duff
a8e8dd0451 Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: cf52ba27a7 [formerly 5476afd095] [formerly d2eed9891a] [formerly d2eed9891a [formerly d803986440]] [formerly cf52ba27a7 [formerly 5476afd095] [formerly d2eed9891a] [formerly d2eed9891a [formerly d803986440]] [formerly 98b5fd762e [formerly d2eed9891a [formerly d803986440] [formerly 98b5fd762e [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]]]
Former-commit-id: 98b5fd762e
Former-commit-id: 9138df77b8 [formerly cd626d0555] [formerly f92754f752] [formerly 2fb8227b9ab14758e44f060685c62a92e542d8d7 [formerly 7b61ae882d35a9231f7bff856832af42ae2f309a] [formerly f92754f752 [formerly b1d74f855e]]]
Former-commit-id: 235ae3f3f9be4da11524918f760776b2d03c98ab [formerly 7aadfd7a15d93ff37cbf9b952a4c1868beb41dee] [formerly 5e0e640336 [formerly 531e66cbb6]]
Former-commit-id: 5e0e640336
Former-commit-id: db4d8b76f0
2014-03-27 16:31:30 -05:00
Roger Ferrel
e94a03ff13 Issue #2879 Code clean up.
Former-commit-id: b817e8ff9d [formerly 131f48b094] [formerly 4a306121bd] [formerly 4a306121bd [formerly dd09032119]] [formerly b817e8ff9d [formerly 131f48b094] [formerly 4a306121bd] [formerly 4a306121bd [formerly dd09032119]] [formerly f6fe26d3de [formerly 4a306121bd [formerly dd09032119] [formerly f6fe26d3de [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]]]
Former-commit-id: f6fe26d3de
Former-commit-id: 97c1091cc1 [formerly 84af47197e] [formerly ba38afeeb9] [formerly dc28919c20783f3f295d206e8612a3d6a44e40aa [formerly 6ccd977daf48d3ec39f823e632c44c3cf519092d] [formerly ba38afeeb9 [formerly 867d85e17d]]]
Former-commit-id: 1f57b8212ffd4721171704a6de99e5a9dca08a44 [formerly 93ba9785644a1a92fd98cf1c11a27afb2927fe88] [formerly 17fe559a70 [formerly d44c677b5a]]
Former-commit-id: 17fe559a70
Former-commit-id: 0d00028dbb
2014-03-27 16:17:02 -05:00
Roger Ferrel
b18c9ba6e1 Issue #2879 Loading case no longer changes start/end time.
Former-commit-id: f7e8fd9f2b [formerly db88893eac] [formerly 6e2d462052] [formerly 6e2d462052 [formerly 2f9c62bd0c]] [formerly f7e8fd9f2b [formerly db88893eac] [formerly 6e2d462052] [formerly 6e2d462052 [formerly 2f9c62bd0c]] [formerly b78a05658d [formerly 6e2d462052 [formerly 2f9c62bd0c] [formerly b78a05658d [formerly 60275732b2abcecf671a8338c8f87334baad3702]]]]]
Former-commit-id: b78a05658d
Former-commit-id: f9be8ef0af [formerly 7a33681851] [formerly 394e8fcbcf] [formerly 4608f2eb96efc270e5ce8b946d4e6f3220fb768f [formerly c545ff124a95b3a99150b9de93f0f583ad152243] [formerly 394e8fcbcf [formerly 16ade55cb6]]]
Former-commit-id: cf3865fc36abbe7d50b8a6d6907cc5927eaec164 [formerly 57445f1cdff14fed91c5451d70a4254ed882e1b8] [formerly c907b28a02 [formerly 9c1dc3c8ab]]
Former-commit-id: c907b28a02
Former-commit-id: d0d2da8c96
2014-03-27 15:52:31 -05:00
Ben Steffensmeier
235535ac20 Issue #2791 Fix streamlines that were broken in conversion to data source.
Former-commit-id: 3af21bb5a8 [formerly 288621fd9c] [formerly 4289b416c0] [formerly 4289b416c0 [formerly b4c30292f8]] [formerly 3af21bb5a8 [formerly 288621fd9c] [formerly 4289b416c0] [formerly 4289b416c0 [formerly b4c30292f8]] [formerly 3c6fa3bfc8 [formerly 4289b416c0 [formerly b4c30292f8] [formerly 3c6fa3bfc8 [formerly 644ceb3fb7a4f01f74a0259043b23e4d01ce16c0]]]]]
Former-commit-id: 3c6fa3bfc8
Former-commit-id: 0397e04bd6 [formerly 0efa412e99] [formerly 83d17a138e] [formerly 9f013e6f71d6f6d0e725584103d52c6dd50a8d54 [formerly a8575e0c50ea7854743176738e8faefc64b768b6] [formerly 83d17a138e [formerly 2589749b76]]]
Former-commit-id: 77ed65f7617cf9ada81a7af1e9fc059ca1db3dcc [formerly ebabe04a6177553af86c870b0d009dcae5a7b594] [formerly 7e0fc8bda5 [formerly f7ecee99ff]]
Former-commit-id: 7e0fc8bda5
Former-commit-id: 225ee343a4
2014-03-27 15:09:00 -05:00
Roger Ferrel
6d9a499580 Issue #2790 Detect problems caused by simultaneous running of purge.
Former-commit-id: 0f323d9011 [formerly e2ba200bfb] [formerly ae2cb792a1] [formerly ae2cb792a1 [formerly ad5d6428a6]] [formerly 0f323d9011 [formerly e2ba200bfb] [formerly ae2cb792a1] [formerly ae2cb792a1 [formerly ad5d6428a6]] [formerly f012ac179d [formerly ae2cb792a1 [formerly ad5d6428a6] [formerly f012ac179d [formerly 882cf75a4b9a5773def3dc9f167d2c441883789f]]]]]
Former-commit-id: f012ac179d
Former-commit-id: cd15e0f6a1 [formerly 28ddd79513] [formerly b9e1dd70a9] [formerly adfc0d6e22fd01d27b38ee9cc3b9966be904cd42 [formerly 9283ecb3a1798b165e95cbccd2ae0f07d19e5431] [formerly b9e1dd70a9 [formerly 8b24d06488]]]
Former-commit-id: a403b35979d56fa3d0fe632bb9956bcb9d970bc2 [formerly b2348de602447bfe1dd0f315fce63af3bb522a01] [formerly fef551ba78 [formerly 111415e9f5]]
Former-commit-id: fef551ba78
Former-commit-id: b56d1cce54
2014-03-27 14:42:09 -05:00
Ron Anderson
2d1701921f Merge "Issue #2664 Added support for non-WGS84 shape files" into development
Former-commit-id: 8543842f16 [formerly e7ec80c0ca] [formerly a97734c786] [formerly a97734c786 [formerly 21e3eeca05]] [formerly 8543842f16 [formerly e7ec80c0ca] [formerly a97734c786] [formerly a97734c786 [formerly 21e3eeca05]] [formerly 86c0fe78f2 [formerly a97734c786 [formerly 21e3eeca05] [formerly 86c0fe78f2 [formerly 6ec350a33b6f5bca31906ff2f7b5b76911f33973]]]]]
Former-commit-id: 86c0fe78f2
Former-commit-id: 9e709f297c [formerly 6264fd681d] [formerly 374f012e85] [formerly 6b7d3d1576638cc5e2c537430910f2fae97be9ca [formerly 277e90770a5c5453a1ebffc7aa107e33b2fb38a6] [formerly 374f012e85 [formerly c318aa6547]]]
Former-commit-id: 8ad7af7ca00518cd5dc66350c3fb2b2669b2a858 [formerly ad44818ed2b68b4354be44e373ce58805e068972] [formerly 93d29b05a9 [formerly 8eb249f866]]
Former-commit-id: 93d29b05a9
Former-commit-id: 350eb0a1ca
2014-03-27 14:35:34 -05:00
Ron Anderson
0435addd2e Issue #2664 Added support for non-WGS84 shape files
Change-Id: Id7ec05ddd6c8ff8b144ef4208db3e052e9693951

Former-commit-id: 7ad03cfc93 [formerly b08d5dfe21] [formerly c9e456983b] [formerly c9e456983b [formerly 1b39ed7771]] [formerly 7ad03cfc93 [formerly b08d5dfe21] [formerly c9e456983b] [formerly c9e456983b [formerly 1b39ed7771]] [formerly 4c6cddc7d4 [formerly c9e456983b [formerly 1b39ed7771] [formerly 4c6cddc7d4 [formerly 143017d2a61b242a7fa5d9ad596cd958cea1df3a]]]]]
Former-commit-id: 4c6cddc7d4
Former-commit-id: e050092adc [formerly fb564d8275] [formerly 527399107f] [formerly aa31bbb5deb350130bccd2454d12afedf62d601a [formerly 4fef82c9075c140b26c17875dcbc2c745ae87cba] [formerly 527399107f [formerly 65d4400471]]]
Former-commit-id: d5b5961fe0daaf1d416d67058eb267d3995c804b [formerly 3c3058cdbd32ff8cd85f2b3669d54013ea5c1764] [formerly b92df6757a [formerly 8f6c261d0d]]
Former-commit-id: b92df6757a
Former-commit-id: 646c62a8ba
2014-03-27 13:04:44 -05:00
Slav Korolev
701b18882a Issue #2811 - Added check for empty message. Updated logger.
Former-commit-id: 69fcf2bcff [formerly 8c9fd8176b] [formerly 24895b9308] [formerly 24895b9308 [formerly 9ac8a7a2f3]] [formerly 69fcf2bcff [formerly 8c9fd8176b] [formerly 24895b9308] [formerly 24895b9308 [formerly 9ac8a7a2f3]] [formerly 982735561c [formerly 24895b9308 [formerly 9ac8a7a2f3] [formerly 982735561c [formerly e0010578785dd88861e8c9ef229e3e6452a5bd0e]]]]]
Former-commit-id: 982735561c
Former-commit-id: 6dadedf3a2 [formerly e932f63edc] [formerly 0b04fb80e3] [formerly 94571328bacee13a62b91c0151eb55c19be38073 [formerly 004d3f4af058bed1be995f9ee4c21da64edf5fe7] [formerly 0b04fb80e3 [formerly b5fb10a84d]]]
Former-commit-id: 2cc328689d9d7954157b5851af067c3187b05064 [formerly 5aa144d1179c212b9ff1c96b46b41f27e8a178b7] [formerly 6efb1f4f5c [formerly 08be3d0f45]]
Former-commit-id: 6efb1f4f5c
Former-commit-id: 0c5b7e28eb
2014-03-27 10:54:41 -04:00
Bryan Kowal
8f200f9f64 Merge "Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts" into development
Former-commit-id: c41d622e96 [formerly b55006b39a] [formerly 5b563bf870] [formerly 5b563bf870 [formerly e0d15b8e29]] [formerly c41d622e96 [formerly b55006b39a] [formerly 5b563bf870] [formerly 5b563bf870 [formerly e0d15b8e29]] [formerly faa7604827 [formerly 5b563bf870 [formerly e0d15b8e29] [formerly faa7604827 [formerly cd8b9072bf3c0e5c4c29f6656bb1a65c406fd5d1]]]]]
Former-commit-id: faa7604827
Former-commit-id: ce2fbdaa2a [formerly fad5502b49] [formerly 5ce208ec73] [formerly 263316217ec990fa79ec9225dc5ff189110ee392 [formerly 55c97eebe8665cd8a5690127e9024a4759ccbf78] [formerly 5ce208ec73 [formerly 7d68836b88]]]
Former-commit-id: 04947efdcd46b5efd14f66fa1f040691bff4babe [formerly bf823af8b5dc1647aa95c10de14343ce893dff72] [formerly a64288b37d [formerly 01a7d32bc1]]
Former-commit-id: 26f5c7c0ddfea2aa9a8cb93f7a93a89520eeb2b8 [formerly a64288b37d]
Former-commit-id: 81409b58ad
2014-03-27 09:25:14 -05:00
Steve Harris
59974fb4e1 Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: 109a7fd70c [formerly 883244fa2e] [formerly 29f4f53d27] [formerly 29f4f53d27 [formerly a70710b467]] [formerly 109a7fd70c [formerly 883244fa2e] [formerly 29f4f53d27] [formerly 29f4f53d27 [formerly a70710b467]] [formerly 656ae897c1 [formerly 29f4f53d27 [formerly a70710b467] [formerly 656ae897c1 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]]]
Former-commit-id: 656ae897c1
Former-commit-id: cb863a8d69 [formerly 4cc478e83b] [formerly b99ed0cce6] [formerly 4fdfdae1b12d550221655dfcc40aab2e434a6790 [formerly c89d11e09dd409255cf1e5daff026439aa00fab2] [formerly b99ed0cce6 [formerly b1d31f21bc]]]
Former-commit-id: 6b7d7b443473348102c14cb64ec5ddb220bffa12 [formerly 1efcd8cc307635929ab51dd088d4ae8d0cac33f0] [formerly d9af02b1d2 [formerly 2d6dde4ac6]]
Former-commit-id: 98a0e698c7429c4d415e58fcac6d8471631defc8 [formerly d9af02b1d2]
Former-commit-id: 64b4a6a719
2014-03-26 16:19:26 -05:00
Steve Harris
963d732c1a Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: aa7a9cdd6a [formerly ef7ebd22b4] [formerly d940427408] [formerly d940427408 [formerly 53f91fdeea]] [formerly aa7a9cdd6a [formerly ef7ebd22b4] [formerly d940427408] [formerly d940427408 [formerly 53f91fdeea]] [formerly e5910b6c60 [formerly d940427408 [formerly 53f91fdeea] [formerly e5910b6c60 [formerly b0b18895aa445ee9b29674443529558b2141c042]]]]]
Former-commit-id: e5910b6c60
Former-commit-id: ab7472d75b [formerly 46efda0c29] [formerly 9d4f24da7b] [formerly 17911db0ab56fa9820a2dab43b440ac043eeff35 [formerly 81756753feb5c4701663ee447ac1a92dcfa9676d] [formerly 9d4f24da7b [formerly 1b9ebbddcc]]]
Former-commit-id: 2722375133274351541c953491f4dbe1b701bb9b [formerly 5fea27f243c9eecb35421417c3ad89c087bf92ae] [formerly 76def67552 [formerly 7a7a9cc18e]]
Former-commit-id: 76def67552
Former-commit-id: 1b2aaf6387
2014-03-26 16:13:59 -05:00
Nate Jensen
3df27592a3 Merge "Issue #2905 fixed types, added scale/offset in bufr parser" into development
Former-commit-id: 408c14870f [formerly ac0b43566e] [formerly 5a035c3730] [formerly 5a035c3730 [formerly c97c56c182]] [formerly 408c14870f [formerly ac0b43566e] [formerly 5a035c3730] [formerly 5a035c3730 [formerly c97c56c182]] [formerly cf0afc8e57 [formerly 5a035c3730 [formerly c97c56c182] [formerly cf0afc8e57 [formerly d324fc13d63bbd8edb780512fdce49b1e7c15a92]]]]]
Former-commit-id: cf0afc8e57
Former-commit-id: 09e28afbfc [formerly 3c79a87b2e] [formerly c783b80d8e] [formerly 77761694869bfad525d73b6157716c7b331b66e4 [formerly 250e8792f4970f1599caa024a87cb739aec13c8a] [formerly c783b80d8e [formerly 59fe50e847]]]
Former-commit-id: 6d9d2fb8f1c89fe08bdc08cc1c085748ea9b7631 [formerly 95b3ef5a07b915140a0025dee8e644b30283b2bc] [formerly 75c45b23f9 [formerly 7b54be41b6]]
Former-commit-id: 75c45b23f9
Former-commit-id: 7675b787ce
2014-03-26 16:12:16 -05:00
Lee Venable
18fa562714 Merge "Issue #2930 - Fixed error in distance." into development
Former-commit-id: 6c40ab2918 [formerly d7f74c4608] [formerly a03c5a4922] [formerly a03c5a4922 [formerly 7ab1ce0f90]] [formerly 6c40ab2918 [formerly d7f74c4608] [formerly a03c5a4922] [formerly a03c5a4922 [formerly 7ab1ce0f90]] [formerly c0bd44bca8 [formerly a03c5a4922 [formerly 7ab1ce0f90] [formerly c0bd44bca8 [formerly e924e378e2f0572f2ee02b23fee61e725f34ce93]]]]]
Former-commit-id: c0bd44bca8
Former-commit-id: 12e46a8ba9 [formerly a7f0db7114] [formerly 70a0e968d3] [formerly be8c27d723e2a0ede2dc7a62bbdffd9e4fc26957 [formerly 49ad054eca3e76810df279ec791f17454aa62f8a] [formerly 70a0e968d3 [formerly 1225edafba]]]
Former-commit-id: 8c53dd69196defd25b1721bb0abf5358c5e10ba9 [formerly 384a8700c2aa2fa306ff42c683e44d64bf74553b] [formerly 0c6f0a1c36 [formerly 16cef3e8ae]]
Former-commit-id: 0c6f0a1c36
Former-commit-id: f23d4c1c3e
2014-03-26 15:50:14 -05:00
Brian Clements
c1de825aad Issue #2905 fixed types, added scale/offset in bufr parser
parser now does the following for each data value:
1) promote unsigned values to next larger type
2) replace with null if value equals missing value
3) apply scale factor and addition offset
to do this, the netcdf variable for each structure member was needed
this required walking the variable list along with the struct iterator


Former-commit-id: b03cf61f38 [formerly fd1ad8de3b] [formerly 52a7443a6c] [formerly 52a7443a6c [formerly 82cee15739]] [formerly b03cf61f38 [formerly fd1ad8de3b] [formerly 52a7443a6c] [formerly 52a7443a6c [formerly 82cee15739]] [formerly 3e5a5774c4 [formerly 52a7443a6c [formerly 82cee15739] [formerly 3e5a5774c4 [formerly dee6d1d1bd169854109f0921ca0c23bc212d2df9]]]]]
Former-commit-id: 3e5a5774c4
Former-commit-id: c5cda90142 [formerly cdf6991fde] [formerly 796305a348] [formerly d92de96702bcb5e67ab6265f49d09986497211ed [formerly 22579f0db72fee00e444ab1a89a6b5b9d69cce63] [formerly 796305a348 [formerly e3020dbe8f]]]
Former-commit-id: ea6f3a043bfaaa1a1bfc422dc2e9652ed9c2dcdb [formerly 8ca290ab6d586c69ce59ca620fc83b3705df85ed] [formerly d1f3144e7b [formerly 38cc44f20a]]
Former-commit-id: d1f3144e7b
Former-commit-id: f005090cc1
2014-03-26 15:20:16 -05:00
Bryan Kowal
40274c1c80 Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
Former-commit-id: f5612f0227 [formerly d455d71216] [formerly 911c0a99c9] [formerly 911c0a99c9 [formerly a554dc8c20]] [formerly f5612f0227 [formerly d455d71216] [formerly 911c0a99c9] [formerly 911c0a99c9 [formerly a554dc8c20]] [formerly 286051cbb9 [formerly 911c0a99c9 [formerly a554dc8c20] [formerly 286051cbb9 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]]]
Former-commit-id: 286051cbb9
Former-commit-id: 30faf67733 [formerly 718bbc47f4] [formerly f0f10e2544] [formerly fbf4e7981810be2de77baf5592a115957e630ced [formerly 92b3111cb9f6f27db1c947559a4696fd1d1b0a4b] [formerly f0f10e2544 [formerly 6b28f08242]]]
Former-commit-id: 661ad29741021142618ea2f5550fd8cc4e1b7f6a [formerly ce22ec280d942b3e0262be01d99c367f30ddd085] [formerly 6dc3ae2214 [formerly f5c1cf750b]]
Former-commit-id: 6dc3ae2214
Former-commit-id: 7cf013ef34
2014-03-26 14:57:46 -05:00
Richard Peter
767f14ab34 Merge "Issue #2905 added translation tables for BUFR" into development
Former-commit-id: 9fae8f4355 [formerly c4907301e1] [formerly 51485f9a74] [formerly 51485f9a74 [formerly a47ad6a51d]] [formerly 9fae8f4355 [formerly c4907301e1] [formerly 51485f9a74] [formerly 51485f9a74 [formerly a47ad6a51d]] [formerly cf494e3290 [formerly 51485f9a74 [formerly a47ad6a51d] [formerly cf494e3290 [formerly 6bc42a9fd38373b4ba8cdbc9a8091eee8b867acd]]]]]
Former-commit-id: cf494e3290
Former-commit-id: 8d533cb5ca [formerly 338bf77db7] [formerly 89680c26a0] [formerly d6e8f83acac8ae00b89a65cbd9380608e7653e63 [formerly 74585618b613441556f86ffd8482471510957896] [formerly 89680c26a0 [formerly 9e193a27eb]]]
Former-commit-id: 824f44fb3da987b078b656b4ca0f291147241c2b [formerly 9266de8b0502bbbad3320aa5f8515883b1b9814e] [formerly 3b21d80e86 [formerly 2be893ab5d]]
Former-commit-id: 3b21d80e86
Former-commit-id: 7df7a8e5df
2014-03-26 14:47:58 -05:00
Brian Clements
dc617dbedf Issue #2905 added translation tables for BUFR
added current WMO BUFR code/flag XML table file
created parser that can read the WMO XML
created JAXB files for BUFR translation XML files
created utility to generate translation tables for specific BUFR tables


Former-commit-id: 1e826948c0 [formerly 5eee7e6034] [formerly f4ac2d117e] [formerly f4ac2d117e [formerly 6d3d459a90]] [formerly 1e826948c0 [formerly 5eee7e6034] [formerly f4ac2d117e] [formerly f4ac2d117e [formerly 6d3d459a90]] [formerly d9eb75280d [formerly f4ac2d117e [formerly 6d3d459a90] [formerly d9eb75280d [formerly 2634afede20af4ab6d059ef6dbd1af093184f90a]]]]]
Former-commit-id: d9eb75280d
Former-commit-id: aa5a73e658 [formerly 628831261b] [formerly 1bfbe099ea] [formerly 0f8581f7d1461c24f607190103a6ff5f934e7355 [formerly 829beea4f8449a55d4ba450cb7b423c7d691c147] [formerly 1bfbe099ea [formerly a153775c32]]]
Former-commit-id: 3ee615978030f31c24c3fde5ab46a18405e38e2f [formerly d772b46e5a1d8c24a3098e4dd949f435573b7830] [formerly 2169cffb74 [formerly 77b66da899]]
Former-commit-id: a9ecdce7c06b3d7f5ed8be2950e0ffad78cc8aeb [formerly 2169cffb74]
Former-commit-id: 36440ad4b6
2014-03-26 14:34:41 -05:00
Slav Korolev
cea0adb6fa Issue #2930 - Fixed error in distance.
Former-commit-id: 59debc8e86 [formerly e39ed3568a] [formerly b197408019] [formerly b197408019 [formerly c0688f9e99]] [formerly 59debc8e86 [formerly e39ed3568a] [formerly b197408019] [formerly b197408019 [formerly c0688f9e99]] [formerly 9b9d7f8f4e [formerly b197408019 [formerly c0688f9e99] [formerly 9b9d7f8f4e [formerly c56753c19f8413e1094b524a9bc43bbcfc74e46f]]]]]
Former-commit-id: 9b9d7f8f4e
Former-commit-id: 5468e78a62 [formerly e112de7701] [formerly 154206a2cb] [formerly b6f376d72ee3d9d08f6e81a1c67f7b660f66bfa2 [formerly 1652d8a3ce196167348b0fbd1e7557d4d751c3c6] [formerly 154206a2cb [formerly 77803ef6b6]]]
Former-commit-id: d73aa578d1d49feeb06d6ccfa63d7ff3c502b2eb [formerly 22a46cada21ed08a62c00ca787d93d5c7f58a2b8] [formerly e4db649080 [formerly c3a213890e]]
Former-commit-id: e4db649080
Former-commit-id: 6435697640
2014-03-26 10:48:38 -04:00
Bryan Kowal
fc88c68196 Merge "Issue #2851 - 64-bit gridslice library for Windows" into development
Former-commit-id: 9560dba2a0 [formerly 3821e13dcd] [formerly 3f06c30135] [formerly 3f06c30135 [formerly 386e85fce9]] [formerly 9560dba2a0 [formerly 3821e13dcd] [formerly 3f06c30135] [formerly 3f06c30135 [formerly 386e85fce9]] [formerly 6df224e171 [formerly 3f06c30135 [formerly 386e85fce9] [formerly 6df224e171 [formerly c28104c670e68296662a2d81def52d1122a7ef98]]]]]
Former-commit-id: 6df224e171
Former-commit-id: 334aa7f4a8 [formerly 1a1c33b8c8] [formerly d8b088392b] [formerly 5a70249a150f8dbf2b60704a9688490de3c1b599 [formerly b1fdb0c4cb169ca5eddb0cdb3e8bfdb6ee9a3dbb] [formerly d8b088392b [formerly 70fdc03a5c]]]
Former-commit-id: d690231e898cccaae8d98daa89589cf39d653d2f [formerly b381d3bffe26ed16cde6f061a49487c72c515ad4] [formerly ccff1985f9 [formerly 7a451cd404]]
Former-commit-id: ccff1985f9
Former-commit-id: 76ff65b153
2014-03-26 09:19:05 -05:00
Brian.Dyke
d9bdc4cc43 Fixed comment merge conflicts added .gitignore
Former-commit-id: 12fb1e7cfb [formerly 642cdfe2e6] [formerly 027cca8673] [formerly 027cca8673 [formerly 7cc471a9c9]] [formerly 12fb1e7cfb [formerly 642cdfe2e6] [formerly 027cca8673] [formerly 027cca8673 [formerly 7cc471a9c9]] [formerly a0e7cb624a [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 19849840be [formerly 6476c4fb85] [formerly 412a7eb2c2] [formerly 60279a83ad18e6bd031bd551e2fc8639a00876d8 [formerly 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f] [formerly 412a7eb2c2 [formerly d8256c4226]]]
Former-commit-id: d19157684bfad244ba5a116e5442409e93ab71ea [formerly 8a69e5f0509d10278a9c81d31ec5d2e0a9d1f376] [formerly e7aea77979 [formerly c19fc33493]]
Former-commit-id: e7aea77979
Former-commit-id: dc35ed8fe1
2014-03-25 15:41:58 -04:00
Ron Anderson
d0912685fc Merge "Issue #2874 Initial implementation of RTOFS data." into development
Former-commit-id: b9afeca8f0 [formerly 1715102f26] [formerly c8b2da72ee] [formerly c8b2da72ee [formerly 1cad7c8ea7]] [formerly b9afeca8f0 [formerly 1715102f26] [formerly c8b2da72ee] [formerly c8b2da72ee [formerly 1cad7c8ea7]] [formerly fdbb505679 [formerly c8b2da72ee [formerly 1cad7c8ea7] [formerly fdbb505679 [formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]]]]]
Former-commit-id: fdbb505679
Former-commit-id: 49bbda4823 [formerly ac0f8c1339] [formerly b154755f33] [formerly a72bcac8d4bdab5329d8317a33cead3c652183e5 [formerly 1ac36120a099b3b2a502909144590734aecf5303] [formerly b154755f33 [formerly bbbf19c72e]]]
Former-commit-id: c428252941baf66af095aedaa8b62021d30d9230 [formerly 3c82c84f59dde146d2dc5bd1f90dd7c031a5fdf9] [formerly d843d14130 [formerly e7e9cf1e36]]
Former-commit-id: d843d14130
Former-commit-id: 743af9ff6e
2014-03-25 13:20:02 -05:00
Richard Peter
15f7a8049a Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development
Former-commit-id: 97c148ead9 [formerly 4188281e8b] [formerly c37a55b552] [formerly c37a55b552 [formerly 3e2f280091]] [formerly 97c148ead9 [formerly 4188281e8b] [formerly c37a55b552] [formerly c37a55b552 [formerly 3e2f280091]] [formerly 3221310454 [formerly c37a55b552 [formerly 3e2f280091] [formerly 3221310454 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]]]]
Former-commit-id: 3221310454
Former-commit-id: 5852220971 [formerly e5dc574b44] [formerly 457e51a4ee] [formerly f334595b604c7519d4100ccaf633d67008b517bc [formerly dd67ae29188f830e505220cad6a9914b86728cf8] [formerly 457e51a4ee [formerly 6ebd2444ef]]]
Former-commit-id: 72e41dfa7acd2481ea9fe301e9fdbf2b13d73fcb [formerly 9e25d318570ed325f8c438ef3e7becc22eb1ed13] [formerly f8765902f3 [formerly 4a3238b071]]
Former-commit-id: f92610ec65ce837152f0761d0636f2e1513d8efc [formerly f8765902f3]
Former-commit-id: 623c22dc31
2014-03-25 13:11:36 -05:00
Nate Jensen
0b128770e3 Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: 249f56e06a [formerly d1ca7d7c75] [formerly c7dc0baeb9] [formerly c7dc0baeb9 [formerly 38e3305e60]] [formerly 249f56e06a [formerly d1ca7d7c75] [formerly c7dc0baeb9] [formerly c7dc0baeb9 [formerly 38e3305e60]] [formerly 4861f92ef6 [formerly c7dc0baeb9 [formerly 38e3305e60] [formerly 4861f92ef6 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 2164b59651 [formerly 0a9da8ca6c] [formerly 307cdc15c1] [formerly c19460410d9a6b6b6cbbd2043fc97661dfeaf15c [formerly f289ec627b5f30e10b3a962e1f08f3e13492e4e2] [formerly 307cdc15c1 [formerly 7c581cb5d7]]]
Former-commit-id: c9a190f018f598222de48dd0488e85d6c0ca861a [formerly 2b59d9930948c459e8f6edef62cf78dc6f8d5fda] [formerly a36bdb3b99 [formerly 015dc45eba]]
Former-commit-id: a36bdb3b99
Former-commit-id: 64be4dae2d
2014-03-25 13:11:29 -05:00
Bryan Kowal
ece71d42a1 Issue #2851 - 64-bit gridslice library for Windows
cave/build/static/win32.amd64/cave/lib/gridslice.pyd: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly


Former-commit-id: 7f87d9ad98 [formerly 4e4f55eb6c] [formerly 065e1dac5e] [formerly 065e1dac5e [formerly 37a6b85483]] [formerly 7f87d9ad98 [formerly 4e4f55eb6c] [formerly 065e1dac5e] [formerly 065e1dac5e [formerly 37a6b85483]] [formerly 53d1b8bcbb [formerly 065e1dac5e [formerly 37a6b85483] [formerly 53d1b8bcbb [formerly 687a060d44c88723de7f775925536adb9f71a257]]]]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: 90cfa9faf2 [formerly 5e07b5f00d] [formerly 77601dbb9f] [formerly 533648f7a8d5f8368845fd53c91ebfe2b1287661 [formerly e2ae36264143a5a4e9f00cb98512d5d27750943e] [formerly 77601dbb9f [formerly dcaac3d61d]]]
Former-commit-id: 30bc1a7c36740a92c27bec9f896945c6e931ee45 [formerly c95efa5e24ae795fb1c31d13c054b1b9f956a07a] [formerly 6a9e1fec9c [formerly 95f181f95f]]
Former-commit-id: 6a9e1fec9c
Former-commit-id: 55d6a3d893
2014-03-25 13:03:44 -05:00
Brian.Dyke
dbf6bc3045 OB_14.1.1-25 baseline
Former-commit-id: 7ed0453967 [formerly c66bac30c7] [formerly c085bc6879] [formerly c085bc6879 [formerly c67833407c]] [formerly 7ed0453967 [formerly c66bac30c7] [formerly c085bc6879] [formerly c085bc6879 [formerly c67833407c]] [formerly 074abeb0fa [formerly c085bc6879 [formerly c67833407c] [formerly 074abeb0fa [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]]]
Former-commit-id: 074abeb0fa
Former-commit-id: bdfae8f01a [formerly 5b848e5480] [formerly 95ada25b65] [formerly 76848b8b894c0e80e8604a6cd94c2c15a1df29ab [formerly ec4f283a91b4ae374dc7edc0c06351378f44b61f] [formerly 95ada25b65 [formerly 36fdf6bfe4]]]
Former-commit-id: 011b44156c3cfa11986f55b6541617b6ab3dbbc8 [formerly 01adcc7557cfbd24c6477e8cc858ba353ef8328c] [formerly 2ba9b8825b [formerly 05ab17425c]]
Former-commit-id: 49edf296ff37f0faaa9ff2c4a352704b7055f897 [formerly 2ba9b8825b]
Former-commit-id: fbba012c20
2014-03-25 13:55:54 -04:00
Mike Duff
b4b5eacb06 Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text
Change-Id: I444477eadf8b2d9a2afd5cc4089b4f3137b50b0b

Former-commit-id: 88c2aa5fa3 [formerly e0fc16c612] [formerly 1eefb7be44] [formerly 1eefb7be44 [formerly 0bfdcdcbe0]] [formerly 88c2aa5fa3 [formerly e0fc16c612] [formerly 1eefb7be44] [formerly 1eefb7be44 [formerly 0bfdcdcbe0]] [formerly befb72d65e [formerly 1eefb7be44 [formerly 0bfdcdcbe0] [formerly befb72d65e [formerly b69a8729347de1f0a8ab855f778559085c6de741]]]]]
Former-commit-id: befb72d65e
Former-commit-id: 83736a42d4 [formerly 78523a861c] [formerly f0f10d8061] [formerly e2a793a92cb8ab5ff67f7781ad91bfebb623b23e [formerly 81e6f193a12ca5c960bf6c6512fb2a5e76dbdeec] [formerly f0f10d8061 [formerly c13b5959e9]]]
Former-commit-id: 8bf92a012a6a081a19e1d3dd33bd6b02d8bfaa60 [formerly 8ee7955908dabc55180cbe5783a7c2c0b5910e15] [formerly a86684f034 [formerly 8f0a23c91b]]
Former-commit-id: a86684f034
Former-commit-id: e83edec2f9
2014-03-25 12:13:29 -05:00
Nate Jensen
55a22d1ead Merge "Issue #2935 fix refresh issue" into development
Former-commit-id: bda24f04c3 [formerly 61653d8e45] [formerly 07c97d0fda] [formerly 07c97d0fda [formerly 4fe0db7411]] [formerly bda24f04c3 [formerly 61653d8e45] [formerly 07c97d0fda] [formerly 07c97d0fda [formerly 4fe0db7411]] [formerly 21d448c0bc [formerly 07c97d0fda [formerly 4fe0db7411] [formerly 21d448c0bc [formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]]]]]
Former-commit-id: 21d448c0bc
Former-commit-id: 059ce7882f [formerly c4eb2113d8] [formerly 33c20da77f] [formerly ab99ea104a5681aaf68cd73fe4bd594df455e910 [formerly 428b0f96016670efcf89eef5a265277ea2a064c3] [formerly 33c20da77f [formerly c726dd0589]]]
Former-commit-id: 3428d25d8c769fd3c2a31d5a2701fbd5f52acd63 [formerly 2e7d76cf33686af3c2657509f0c3685de39f22ed] [formerly 2d08cd2ec7 [formerly ead4e7833c]]
Former-commit-id: 2d08cd2ec7
Former-commit-id: 6a4a03ce29
2014-03-25 11:25:38 -05:00
Mike Duff
59465950ec Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: 05c4412aa3 [formerly 1d0edcc2c6] [formerly 758fdca514] [formerly 758fdca514 [formerly 1e42d8a30d]] [formerly 05c4412aa3 [formerly 1d0edcc2c6] [formerly 758fdca514] [formerly 758fdca514 [formerly 1e42d8a30d]] [formerly a06f058ea9 [formerly 758fdca514 [formerly 1e42d8a30d] [formerly a06f058ea9 [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]]]
Former-commit-id: a06f058ea9
Former-commit-id: b047f7ff5c [formerly 47402575c0] [formerly 81ac35a1b8] [formerly e7fcf7f5966681d912778265f1da3bd05367933e [formerly 6fb4c8dc2286133134b00c03341141f90a3454df] [formerly 81ac35a1b8 [formerly d497c533e6]]]
Former-commit-id: 0b709cc77ff9e2d3cf77d05556d8aec2eaa5f313 [formerly 2740eb49374c5a2de83bcfcf6da18c01c8648899] [formerly 7705874ea3 [formerly 97c4e48255]]
Former-commit-id: 7705874ea3
Former-commit-id: 3b224f6ac9
2014-03-25 11:18:09 -05:00
Greg Armendariz
2d7bd43e0e Merge "Issue #2851 - 64-bit Windows Jep DLL" into development
Former-commit-id: 8b46dff84c [formerly 269a2f1091] [formerly a628c811ec] [formerly a628c811ec [formerly e8e90ff576]] [formerly 8b46dff84c [formerly 269a2f1091] [formerly a628c811ec] [formerly a628c811ec [formerly e8e90ff576]] [formerly 035029851a [formerly a628c811ec [formerly e8e90ff576] [formerly 035029851a [formerly 4729ae8efbd4ada965c45a67540349cd58a4b543]]]]]
Former-commit-id: 035029851a
Former-commit-id: 2dbf55655b [formerly f9e6adb11f] [formerly fa2e5c0546] [formerly 4db629c5a4b9fa3dc89595429b79ab9bc6191e5d [formerly b8ba835c9b0693ac3c866aecdd38f33affb2f7f9] [formerly fa2e5c0546 [formerly 8d2ad9c43a]]]
Former-commit-id: 4f977e17c33d50860b0c3b7bbff170bf15c3395f [formerly bf65d73b86d0b7b13d16d96f8e1bda187a6e82d3] [formerly 8f54660efa [formerly 386804aa8e]]
Former-commit-id: 8f54660efa
Former-commit-id: 84e0ab5efb
2014-03-25 10:45:18 -05:00
Bryan Kowal
76afb30fc9 Issue #2851 - 64-bit Windows Jep DLL
cots/org.jep.win64/jep.dll: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly


Former-commit-id: 3ea4a759ed [formerly aa83fbe567] [formerly a758bbdfaa] [formerly a758bbdfaa [formerly 5871d767db]] [formerly 3ea4a759ed [formerly aa83fbe567] [formerly a758bbdfaa] [formerly a758bbdfaa [formerly 5871d767db]] [formerly 1feefeb41b [formerly a758bbdfaa [formerly 5871d767db] [formerly 1feefeb41b [formerly c03701dbe9e78dcd72a08a579329be9b4408295f]]]]]
Former-commit-id: 1feefeb41b
Former-commit-id: ffc53cd866 [formerly ea67a997f6] [formerly 278ff3c00a] [formerly 3d2879ea5b069e3c3ee6da2352c8a95faa309683 [formerly a02f1e3bc84b917182117b2f562502f1f22a9e07] [formerly 278ff3c00a [formerly a02cf1f5df]]]
Former-commit-id: 29ff670eb376cbb6a7d6e61c3504b84e5517525c [formerly a5023b761e0b37f2491c40fe890db51bf84322da] [formerly 8c8a0539ce [formerly 116711b64f]]
Former-commit-id: 8c8a0539ce
Former-commit-id: 03a99a0883
2014-03-25 10:27:53 -05:00
Nate Jensen
d7c4d7486a Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: e5bf712521 [formerly c6474ef98e] [formerly d1f080fd05] [formerly d1f080fd05 [formerly 68f9181340]] [formerly e5bf712521 [formerly c6474ef98e] [formerly d1f080fd05] [formerly d1f080fd05 [formerly 68f9181340]] [formerly 7b586ebd67 [formerly d1f080fd05 [formerly 68f9181340] [formerly 7b586ebd67 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]]]
Former-commit-id: 7b586ebd67
Former-commit-id: e948352253 [formerly 19b2056aaf] [formerly 447b1a36bb] [formerly 2204b624fa1e73c825b038623dc2645b41614960 [formerly 1685ee85fb1e67da2bfbc2821c89b427bb01d5d0] [formerly 447b1a36bb [formerly 0cad1fa167]]]
Former-commit-id: 945ba2195dcc4cbb89f03d099c646acbb0acd50a [formerly 48d96d20b890321c6bbe7e22129e08fa04053556] [formerly 8e3b78ba6a [formerly a5b0c8b432]]
Former-commit-id: 8e3b78ba6a
Former-commit-id: d085d6bfcb
2014-03-25 10:24:11 -05:00
Nate Jensen
532e07d925 Merge "Issue #2954 - Handle missing scale files at cave startup." into development
Former-commit-id: e1d7dce3a9 [formerly 8f104b014a] [formerly e64401eedf] [formerly e64401eedf [formerly d11a2dd96b]] [formerly e1d7dce3a9 [formerly 8f104b014a] [formerly e64401eedf] [formerly e64401eedf [formerly d11a2dd96b]] [formerly 9e2a9022ae [formerly e64401eedf [formerly d11a2dd96b] [formerly 9e2a9022ae [formerly 5f8585234a010053c841f2f58a65c6885aea4940]]]]]
Former-commit-id: 9e2a9022ae
Former-commit-id: efe6d7b579 [formerly eba1575cf9] [formerly 476e4df3ff] [formerly 7dd374ee64c438b16cb13a189da04872ceed64d3 [formerly 57178504bc6c5c5d7cb61e70d2bca941f07ed2d2] [formerly 476e4df3ff [formerly 68298da133]]]
Former-commit-id: a54c4ae0f3489404580776ea26eb4e8127a2e1cd [formerly 37eea3fb44b429aaa5481204be0f99fed1786785] [formerly ef30c5f9c8 [formerly 82f9b6a092]]
Former-commit-id: ef30c5f9c8
Former-commit-id: fcfad86ab1
2014-03-25 08:37:55 -05:00