diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/lib/componentloader.js b/src/lib/componentloader.js
index <HASH>..<HASH> 100644
--- a/src/lib/componentloader.js
+++ b/src/lib/componentloader.js
@@ -7,7 +7,7 @@ const registryBaseUrl = 'https://aframe.io/aframe-registry/build/';
* Asynchronously load and register components from the registry.
*/
function ComponentLoader () {
- this.components = null;
+ this.components = [];
this.loadFromRegistry();
}
@@ -22,8 +22,12 @@ ComponentLoader.prototype = {
xhr.open('GET', registryBaseUrl + getMajorVersion(AFRAME.version) + '.json');
xhr.onload = () => {
- this.components = JSON.parse(xhr.responseText).components;
- console.info('Components in registry:', Object.keys(this.components).length);
+ if (xhr.status === 404) {
+ console.error('Error loading registry file: 404');
+ } else {
+ this.components = JSON.parse(xhr.responseText).components;
+ console.info('Components in registry:', Object.keys(this.components).length);
+ }
};
xhr.onerror = () => { console.error('Error loading registry file.'); };
xhr.send();
|
Fixes #<I> - Inspector panel doesnt works if registry build fails
|
diff --git a/lib/traject/solr_json_writer.rb b/lib/traject/solr_json_writer.rb
index <HASH>..<HASH> 100644
--- a/lib/traject/solr_json_writer.rb
+++ b/lib/traject/solr_json_writer.rb
@@ -167,9 +167,11 @@ class Traject::SolrJsonWriter
end
# Returns MARC 001, then a slash, then output_hash["id"] -- if both
- # are present. Otherwise may return just one, or even an empty string.
+ # are present. Otherwise may return just one, or even an empty string.
def record_id_from_context(context)
- marc_id = context.source_record && context.source_record['001'] && context.source_record['001'].value
+ marc_id = if context.source_record && context.source_record.kind_of?(MARC::Record)
+ context.source_record['001'].value
+ end
output_id = context.output_hash["id"]
return [marc_id, output_id].compact.join("/")
|
SolrJsonWriter, guard marc-specific in record_id_from_context
|
diff --git a/lib/filterlib.php b/lib/filterlib.php
index <HASH>..<HASH> 100644
--- a/lib/filterlib.php
+++ b/lib/filterlib.php
@@ -397,6 +397,8 @@ class legacy_filter extends moodle_text_filter {
if ($this->courseid) {
// old filters are called only when inside courses
return call_user_func($this->filterfunction, $this->courseid, $text);
+ } else {
+ return $text;
}
}
}
|
"MDL-<I>, legacy_filter should return text even courseid is null, all text in user context will be empty"
|
diff --git a/lib/chatterbot/search.rb b/lib/chatterbot/search.rb
index <HASH>..<HASH> 100644
--- a/lib/chatterbot/search.rb
+++ b/lib/chatterbot/search.rb
@@ -8,7 +8,8 @@ module Chatterbot
# modify a query string to exclude retweets from searches
#
def exclude_retweets(q)
- q.include?("include:retweets") ? q : q += " -include:retweets"
+ q
+ #q.include?("include:retweets") ? q : q += " -include:retweets"
end
# internal search code
|
disable exclude_retweets for the moment -- this is a breaking change
|
diff --git a/es5-persistence/src/test/java/com/netflix/conductor/dao/es5/index/TestElasticSearchRestDAOV5.java b/es5-persistence/src/test/java/com/netflix/conductor/dao/es5/index/TestElasticSearchRestDAOV5.java
index <HASH>..<HASH> 100644
--- a/es5-persistence/src/test/java/com/netflix/conductor/dao/es5/index/TestElasticSearchRestDAOV5.java
+++ b/es5-persistence/src/test/java/com/netflix/conductor/dao/es5/index/TestElasticSearchRestDAOV5.java
@@ -292,7 +292,7 @@ public class TestElasticSearchRestDAOV5 {
@Test
public void testSearchArchivableWorkflows() throws IOException {
String workflowId = "search-workflow-id";
- Long time = DateTime.now().minusDays(2).toDate().getTime();
+ Long time = DateTime.now().minusDays(7).toDate().getTime();
workflow.setWorkflowId(workflowId);
workflow.setStatus(Workflow.WorkflowStatus.COMPLETED);
@@ -305,7 +305,7 @@ public class TestElasticSearchRestDAOV5 {
assertTrue(indexExists("conductor"));
await()
- .atMost(3, TimeUnit.SECONDS)
+ .atMost(5, TimeUnit.SECONDS)
.untilAsserted(
() -> {
List<String> searchIds = indexDAO.searchArchivableWorkflows("conductor",1);
|
Trying to increase timeouts for the search to be successful.
|
diff --git a/lib/oneview-sdk/resource/api600/synergy/logical_interconnect_group.rb b/lib/oneview-sdk/resource/api600/synergy/logical_interconnect_group.rb
index <HASH>..<HASH> 100644
--- a/lib/oneview-sdk/resource/api600/synergy/logical_interconnect_group.rb
+++ b/lib/oneview-sdk/resource/api600/synergy/logical_interconnect_group.rb
@@ -9,13 +9,13 @@
# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
-require_relative '../c7000/logical_interconnect_group'
+require_relative '../../api500/synergy/logical_interconnect_group'
module OneviewSDK
module API600
module Synergy
# Logical interconnect group resource implementation for API600 Synergy
- class LogicalInterconnectGroup < OneviewSDK::API600::C7000::LogicalInterconnectGroup
+ class LogicalInterconnectGroup < OneviewSDK::API500::Synergy::LogicalInterconnectGroup
end
end
end
|
resource to API <I> Synergy
The resource was set to C<I>, but most of the Logical Interconnect Group functionality for the Synergy are build in '../../api<I>/synergy'.
The recource for api<I> is also set to api<I>.
|
diff --git a/protocol-designer/src/components/BatchEditForm/index.js b/protocol-designer/src/components/BatchEditForm/index.js
index <HASH>..<HASH> 100644
--- a/protocol-designer/src/components/BatchEditForm/index.js
+++ b/protocol-designer/src/components/BatchEditForm/index.js
@@ -190,8 +190,14 @@ export const BatchEditMoveLiquid = (
props: BatchEditMoveLiquidProps
): React.Node => {
const { propsForFields, handleCancel, handleSave } = props
- const [cancelButtonTargetProps, cancelButtonTooltipProps] = useHoverTooltip()
- const [saveButtonTargetProps, saveButtonTooltipProps] = useHoverTooltip()
+ const [cancelButtonTargetProps, cancelButtonTooltipProps] = useHoverTooltip({
+ placement: 'top',
+ strategy: 'fixed',
+ })
+ const [saveButtonTargetProps, saveButtonTooltipProps] = useHoverTooltip({
+ placement: 'top',
+ strategy: 'fixed',
+ })
const disableSave = !props.batchEditFormHasChanges
return (
|
fix(protocol-designer): Update tooltip placement to avoid deckmap conflict (#<I>)
|
diff --git a/lib/eldritch/safe.rb b/lib/eldritch/safe.rb
index <HASH>..<HASH> 100644
--- a/lib/eldritch/safe.rb
+++ b/lib/eldritch/safe.rb
@@ -20,6 +20,6 @@ module Eldritch
# extend Eldritch::DSL # for async method declaration
# end
def self.inject_dsl
- Object.include Eldritch::DSL
+ Object.send :include, Eldritch::DSL
end
end
|
made inject_dsl <I> compatible
Apparently include used to be private
|
diff --git a/bin/bootstrap.js b/bin/bootstrap.js
index <HASH>..<HASH> 100755
--- a/bin/bootstrap.js
+++ b/bin/bootstrap.js
@@ -189,9 +189,9 @@ CasperError.prototype = Object.getPrototypeOf(new Error());
var extensions = ['js', 'coffee', 'json'];
var basenames = [path, path + '/index'];
var paths = [];
- extensions.forEach(function(extension) {
- basenames.forEach(function(basename) {
- paths.push(fs.pathJoin(dir, basename));
+ basenames.forEach(function(basename) {
+ paths.push(fs.pathJoin(dir, basename));
+ extensions.forEach(function(extension) {
paths.push(fs.pathJoin(dir, [basename, extension].join('.')));
});
});
|
Refactor to remove unnecessary entries in paths array
|
diff --git a/lib/targetStore.js b/lib/targetStore.js
index <HASH>..<HASH> 100644
--- a/lib/targetStore.js
+++ b/lib/targetStore.js
@@ -24,6 +24,8 @@ module.exports = function(options) {
req.errorEventKey = 'error::' + nextRequestId();
var respond = function(filePath) {
+ //remove error event since it is no longer needed
+ eventDispatcher.removeAllListeners(req.errorEventKey);
// logger.debug('responding with: ', filePath);
clearTimeout(clientRequestTimeout);
sendResponseToClient(req, res, filePath);
|
Fix: removing error callbacks on success
|
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/tunnel/TunnelRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/tunnel/TunnelRESTService.java
index <HASH>..<HASH> 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/tunnel/TunnelRESTService.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/tunnel/TunnelRESTService.java
@@ -109,8 +109,11 @@ public class TunnelRESTService {
}
/**
- * Deletes the tunnels having the given UUIDs, effectively closing the
- * tunnels and killing the associated connections.
+ * Applies the given tunnel patches. This operation currently only supports
+ * deletion of tunnels through the "remove" patch operation. Deleting a
+ * tunnel effectively closing the tunnel and kills the associated
+ * connection. The path of each patch operation is of the form "/UUID"
+ * where UUID is the UUID of the tunnel being modified.
*
* @param authToken
* The authentication token that is used to authenticate the user
|
GUAC-<I>: Fix patchTunnels() documentation - it's not technically purely deletion anymore.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -19,7 +19,7 @@ module.exports = {
return path.relative(this.project.root, require.resolve(npmCompilerPath));
},
included: function (app) {
- this._super.included(app);
+ this._super.included.apply(this, arguments);
if (app.env === 'production' || app.env === 'test') {
return;
|
fix: apply included function with arguments instead of app
This is the "recommended" way as seen in <URL>` it causes some issues with ember-decorators and the next ember-cli-typescript version.
This will prevent others from having to dive in on why this happens if you try to port your addon to use these addons.
|
diff --git a/textplot/text.py b/textplot/text.py
index <HASH>..<HASH> 100644
--- a/textplot/text.py
+++ b/textplot/text.py
@@ -162,7 +162,8 @@ class Text(object):
signals = []
for term in query_text.terms:
- signals.append(self.kde(term, **kwargs))
+ if term in self.terms:
+ signals.append(self.kde(term, **kwargs))
result = np.zeros(signals[0].size)
for signal in signals: result += signal
|
When running a KDE query, check that a term is present in the base text before trying to generate the estimate.
|
diff --git a/web/concrete/config/app.php b/web/concrete/config/app.php
index <HASH>..<HASH> 100644
--- a/web/concrete/config/app.php
+++ b/web/concrete/config/app.php
@@ -864,4 +864,3 @@ return array(
)
)
);
-
|
Added some functionality for asset groups, and moved all the asset groups into the app file
Former-commit-id: 6e3d<I>b<I>e<I>ea7c8e<I>adb<I>c<I>b<I>c<I>f
|
diff --git a/root_cgo_darwin.go b/root_cgo_darwin.go
index <HASH>..<HASH> 100644
--- a/root_cgo_darwin.go
+++ b/root_cgo_darwin.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build cgo,!arm,!arm64,!ios
+// +build cgo,darwin,!arm,!arm64,!ios
package syscerts
@@ -60,6 +60,8 @@ int FetchPEMRootsC(CFDataRef *pemRoots) {
return 0;
}
*/
+
+/*
import "C"
import (
"crypto/x509"
@@ -80,3 +82,4 @@ func initSystemRoots() {
roots.AppendCertsFromPEM(buf)
systemRoots = roots
}
+*/
diff --git a/root_darwin.go b/root_darwin.go
index <HASH>..<HASH> 100644
--- a/root_darwin.go
+++ b/root_darwin.go
@@ -33,3 +33,7 @@ func execSecurityRoots() (*x509.CertPool, error) {
return roots, nil
}
+
+func initSystemRoots() {
+ systemRoots, _ = execSecurityRoots()
+}
|
remove cgo darwin root for now
|
diff --git a/django_pandas/utils.py b/django_pandas/utils.py
index <HASH>..<HASH> 100644
--- a/django_pandas/utils.py
+++ b/django_pandas/utils.py
@@ -11,7 +11,7 @@ def replace_from_choices(choices):
def get_base_cache_key(model):
- return 'pandas_%s_%s_%%d_rendering' % (
+ return 'pandas_%s_%s_%%s_rendering' % (
model._meta.app_label, model._meta.module_name)
|
The primary key of a model can be a string --> changed syntax for base_cache_key
|
diff --git a/src/server/pps/pretty/pretty.go b/src/server/pps/pretty/pretty.go
index <HASH>..<HASH> 100644
--- a/src/server/pps/pretty/pretty.go
+++ b/src/server/pps/pretty/pretty.go
@@ -87,7 +87,7 @@ func PrintPipelineInputHeader(w io.Writer) {
func PrintPipelineInput(w io.Writer, pipelineInput *ppsclient.PipelineInput) {
fmt.Fprintf(w, "%s\t", pipelineInput.Repo.Name)
fmt.Fprintf(w, "%s\t", pipelineInput.Method.Partition)
- fmt.Fprintf(w, "%t\t\n", pipelineInput.Method.Incremental)
+ fmt.Fprintf(w, "%s\t\n", pipelineInput.Method.Incremental)
}
// PrintJobCountsHeader prints a job counts header.
|
Incremental isn't a bool anymore.
|
diff --git a/src/engine/Engine.js b/src/engine/Engine.js
index <HASH>..<HASH> 100644
--- a/src/engine/Engine.js
+++ b/src/engine/Engine.js
@@ -217,7 +217,7 @@ function Engine(nodes) {
throw new Error('Time given to observe/2 must be a value.');
}
try {
- builtInProcessors['observe/3'].apply(null, [fluent, time, time]);
+ builtInProcessors['observe/3'].apply(null, [fluent, time, time + 1]);
} catch (_) {
throw new Error('Invalid fluent value given for observe/2.');
}
|
update observe/2 to give third arg + 1
|
diff --git a/angular-tree-control.js b/angular-tree-control.js
index <HASH>..<HASH> 100644
--- a/angular-tree-control.js
+++ b/angular-tree-control.js
@@ -110,9 +110,9 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
selectedNode: "=?",
selectedNodes: "=?",
expandedNodes: "=?",
- onSelection: "&",
- onNodeToggle: "&",
- onRightClick: "&",
+ onSelection: "&?",
+ onNodeToggle: "&?",
+ onRightClick: "&?",
menuId: "@",
options: "=?",
orderBy: "=?",
|
Change function bindings to optional bindings.
- They are all covered by individual `if` statements anyway (#L<I>, #L<I>, #L<I>).
- Fixes right click triggering a selection, even if no external function is specified (Tree template no longer includes tree-right-click for an empty angular `parentGet` function).
|
diff --git a/src/Offer/Offer.php b/src/Offer/Offer.php
index <HASH>..<HASH> 100644
--- a/src/Offer/Offer.php
+++ b/src/Offer/Offer.php
@@ -659,7 +659,7 @@ abstract class Offer extends EventSourcedAggregateRoot implements LabelAwareAggr
*/
public function selectMainImage(Image $image)
{
- if (!$this->images->contains($image)) {
+ if (!$this->images->findImageByUUID($image->getMediaObjectId())) {
throw new \InvalidArgumentException('You can not select a random image to be main, it has to be added to the item.');
}
|
III-<I> Search image based on uuid.
|
diff --git a/helpers.php b/helpers.php
index <HASH>..<HASH> 100755
--- a/helpers.php
+++ b/helpers.php
@@ -1,5 +1,6 @@
<?php
+use Illuminate\Contracts\Support\DeferringDisplayableValue;
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
@@ -250,6 +251,10 @@ if (! function_exists('e')) {
*/
function e($value, $doubleEncode = true)
{
+ if ($value instanceof DeferringDisplayableValue) {
+ $value = $value->resolveDisplayableValue();
+ }
+
if ($value instanceof Htmlable) {
return $value->toHtml();
}
|
support echoing parameterless component methods with parens and without
|
diff --git a/mailchimp3/baseapi.py b/mailchimp3/baseapi.py
index <HASH>..<HASH> 100644
--- a/mailchimp3/baseapi.py
+++ b/mailchimp3/baseapi.py
@@ -48,7 +48,8 @@ class BaseApi(object):
if kwargs.get('fields') is None:
kwargs['fields'] = 'total_items'
else: # assume well formed string, just missing 'total_items'
- kwargs['fields'] += ',total_items'
+ if not 'total_items' in kwargs['fields'].split(','):
+ kwargs['fields'] += ',total_items'
#Fetch results from mailchmimp, up to first 100
result = self._mc_client._get(url=url, offset=0, count=100, **kwargs)
|
adjusted _iterate to provide a check for inclusion of total_items in fields kwarg
|
diff --git a/lib/appsignal/version.rb b/lib/appsignal/version.rb
index <HASH>..<HASH> 100644
--- a/lib/appsignal/version.rb
+++ b/lib/appsignal/version.rb
@@ -1,3 +1,3 @@
module Appsignal
- VERSION = '0.5.1'
+ VERSION = '0.5.2'
end
|
Bump to <I> [ci skip]
|
diff --git a/pyemma/util/config.py b/pyemma/util/config.py
index <HASH>..<HASH> 100644
--- a/pyemma/util/config.py
+++ b/pyemma/util/config.py
@@ -181,7 +181,12 @@ False
@property
def show_progress_bars(self):
- return bool(self._conf_values['pyemma']['show_progress_bars'])
+ cfg_val = self._conf_values['pyemma']['show_progress_bars']
+ if isinstance(cfg_val, bool):
+ return cfg_val
+ # TODO: think about a professional type checking/converting lib
+ parsed = True if cfg_val.lower() == 'true' else False
+ return parsed
@show_progress_bars.setter
def show_progress_bars(self, val):
|
[config] fix type detection because of the hillarious bool('False') is True truth.
|
diff --git a/piwik.php b/piwik.php
index <HASH>..<HASH> 100644
--- a/piwik.php
+++ b/piwik.php
@@ -12,6 +12,9 @@ use Piwik\Common;
use Piwik\Timer;
use Piwik\Tracker;
+// Note: if you wish to debug the Tracking API please see this documentation:
+// http://developer.piwik.org/api-reference/tracking-api#debugging-the-tracker
+
$GLOBALS['PIWIK_TRACKER_DEBUG_FORCE_SCHEDULED_TASKS'] = false;
define('PIWIK_ENABLE_TRACKING', true);
|
Adding comment to point users to "how to debug" documentation
|
diff --git a/wpull/protocol/http/web.py b/wpull/protocol/http/web.py
index <HASH>..<HASH> 100644
--- a/wpull/protocol/http/web.py
+++ b/wpull/protocol/http/web.py
@@ -82,8 +82,15 @@ class WebSession(object):
def __exit__(self, exc_type, exc_val, exc_tb):
if self._current_session:
if not isinstance(exc_val, StopIteration):
+ _logger.debug('Early close session.')
+ error = True
self._current_session.abort()
+ else:
+ error = False
+
self._current_session.recycle()
+ self._current_session.event_dispatcher.notify(
+ self._current_session.SessionEvent.end_session, error=error)
@asyncio.coroutine
def start(self):
|
Fix issue whereby WebSession never fires SessionEvent.end_session in its __exit__, thereby causing --warc-max-size to be ignored
|
diff --git a/lib/octopusci/worker_launcher.rb b/lib/octopusci/worker_launcher.rb
index <HASH>..<HASH> 100644
--- a/lib/octopusci/worker_launcher.rb
+++ b/lib/octopusci/worker_launcher.rb
@@ -27,10 +27,21 @@ module Octopusci
if Octopusci::Config['general']['tentacles_user'] != nil
require 'etc'
- chosen_uid = Etc.getpwnam(Octopusci::Config['general']['tentacles_user']).uid
- if chosen_uid
- Process.uid = chosen_uid
- Process.euid = chosen_uid
+ chosen_user = Etc.getpwnam(Octopusci::Config['general']['tentacles_user'])
+ if chosen_user
+ # Switch the effective and real uid to the specified user
+ Process.uid = chosen_user.uid
+ Process.euid = chosen_user.uid
+
+ # Set the USER, HOME, and SHELL environment variables to those found in /etc/passwd for the specified user.
+ # This is important for some applications/scripts like RVM so that they can find things relative to the users home directory.
+ ENV['USER'] = chosen_user.name
+ ENV['SHELL'] = chosen_user.shell
+ ENV['HOME'] = chosen_user.dir
+
+ # Set the OCTOPUSCI environment variable applications to true so that programs instantiated by ocotpusci jobs could determine if
+ # they are being run by octopusci or not.
+ ENV['OCTOPUSCI'] = 'true'
end
end
|
Added environment variable setting for specified daemon user.
I modified octopusci-tentacles so that it sets its HOME, SHELL, and USER environment variables based on the info it finds in /etc/passwd for the specified tentacles_user in the config.yml. I have also modified it to define the OCTOPUSCI environment variable so that when commands are executed by the jobs they can determine if they are being executed by Octopusci or not.
|
diff --git a/timber.php b/timber.php
index <HASH>..<HASH> 100644
--- a/timber.php
+++ b/timber.php
@@ -373,18 +373,22 @@ class Timber {
public function load_template($template, $query = false) {
$template = locate_template($template);
- add_action('send_headers', function () {
- header('HTTP/1.1 200 OK');
- });
- add_action('wp_loaded', function ($template) use ( $template, $query ) {
- if ($query) {
- query_posts( $query );
- }
- if ($template) {
+
+ if ($query) {
+ add_action('do_parse_request',function() use ($query) {
+ global $wp;
+ $wp->query_vars = $query;
+ return false;
+ });
+ }
+ if ($template) {
+ add_action('wp_loaded', function() use ($template) {
+ wp();
+ do_action('template_redirect');
load_template($template);
die;
- }
- }, 10, 1);
+ });
+ }
}
/* Pagination
|
Use wp() instead of manually querying posts in Timber::load_template
|
diff --git a/generator/classes/propel/phing/PropelConvertConfTask.php b/generator/classes/propel/phing/PropelConvertConfTask.php
index <HASH>..<HASH> 100644
--- a/generator/classes/propel/phing/PropelConvertConfTask.php
+++ b/generator/classes/propel/phing/PropelConvertConfTask.php
@@ -91,6 +91,8 @@ class PropelConvertConfTask extends AbstractPropelDataModelTask {
// Create a map of all PHP classes and their filepaths for this data model
+ DataModelBuilder::setBuildProperties($this->getPropelProperties());
+
foreach ($this->getDataModels() as $dataModel) {
foreach ($dataModel->getDatabases() as $database) {
|
ticket:<I> - Set the build properties in !DataModelBuilder, so that the task does not depend on OM or SQL task to have already run.
|
diff --git a/core/graph.py b/core/graph.py
index <HASH>..<HASH> 100644
--- a/core/graph.py
+++ b/core/graph.py
@@ -3,7 +3,7 @@
Modules contains graphing routines common for flow cytometry files.
"""
from fcm.graphics.util import bilinear_interpolate
-from bases import to_list
+from GoreUtilities.util import to_list
import numpy
import pylab as pl
import matplotlib
|
moved to_list method to goreutilities
|
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java b/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java
index <HASH>..<HASH> 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPGuacamoleProperties.java
@@ -64,8 +64,9 @@ public class LDAPGuacamoleProperties {
};
/**
- * The base DN of role based access control (RBAC) groups. All groups
- * should be under this DN.
+ * The base DN of role based access control (RBAC) groups. All groups which
+ * will be used for RBAC must be contained somewhere within the subtree of
+ * this DN.
*/
public static final StringGuacamoleProperty LDAP_GROUP_BASE_DN = new StringGuacamoleProperty() {
|
GUAC-<I>: Clarify definition of "ldap-group-base-dn" property.
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -187,7 +187,7 @@ module.exports = function(grunt) {
grunt.registerTask('build', ['replace', 'jshint', 'uglify:prewebpack', 'webpack', 'uglify:dist']);
grunt.registerTask('release', ['build', 'copyrelease']);
- var testjobs = ['webpack', 'express'];
+ var testjobs = ['uglify:prewebpack', 'webpack', 'express'];
if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined'){
testjobs.push('saucelabs-mocha');
} else {
|
Minimize vendor files before webpack on grunt test.
|
diff --git a/subproviders/hooked-wallet.js b/subproviders/hooked-wallet.js
index <HASH>..<HASH> 100644
--- a/subproviders/hooked-wallet.js
+++ b/subproviders/hooked-wallet.js
@@ -128,6 +128,8 @@ HookedWalletSubprovider.prototype.validateMessage = function(msgParams, cb){
HookedWalletSubprovider.prototype.validateSender = function(senderAddress, cb){
const self = this
+ // shortcut: undefined sender is valid
+ if (senderAddress === undefined) return cb(null, true)
self.getAccounts(function(err, accounts){
if (err) return cb(err)
var senderIsValid = (accounts.indexOf(senderAddress.toLowerCase()) !== -1)
|
hooked-wallet - undefined sender is invalid
|
diff --git a/tests/test_regions.py b/tests/test_regions.py
index <HASH>..<HASH> 100644
--- a/tests/test_regions.py
+++ b/tests/test_regions.py
@@ -109,8 +109,11 @@ class testMutationRegions(unittest.TestCase):
class testMultivariateGaussianEffects(unittest.TestCase):
def testConstruction(self):
- fwdpy11.MultivariateGaussianEffects(
- 0, 1, 1, np.identity(2))
+ try:
+ fwdpy11.MultivariateGaussianEffects(
+ 0, 1, 1, np.identity(2))
+ except Exception:
+ self.fail("Unexpected exception during object construction")
def testInvalidMatrixShape(self):
# Input matrix has wrong shape:
|
check for exceptions during object construction test
|
diff --git a/closure/goog/events/listenable.js b/closure/goog/events/listenable.js
index <HASH>..<HASH> 100644
--- a/closure/goog/events/listenable.js
+++ b/closure/goog/events/listenable.js
@@ -295,7 +295,7 @@ goog.events.ListenableKey.reserveKey = function() {
/**
* The source event target.
- * @type {!(Object|goog.events.Listenable|goog.events.EventTarget)}
+ * @type {Object|goog.events.Listenable|goog.events.EventTarget}
*/
goog.events.ListenableKey.prototype.src;
@@ -323,7 +323,7 @@ goog.events.ListenableKey.prototype.capture;
/**
* The 'this' object for the listener function's scope.
- * @type {Object}
+ * @type {Object|undefined}
*/
goog.events.ListenableKey.prototype.handler;
|
The subclass can't broaden the type of a property. Relax the types of two properties of goog.events.ListenableKey to match the types of goog.events.Listener.
Bugs found by NTI.
-------------
Created by MOE: <URL>
|
diff --git a/test.rb b/test.rb
index <HASH>..<HASH> 100644
--- a/test.rb
+++ b/test.rb
@@ -37,16 +37,11 @@ require 'default_value_for'
puts "\nTesting with Active Record version #{ActiveRecord::VERSION::STRING}\n\n"
-if RUBY_PLATFORM == "java"
- database_adapter = "jdbcsqlite3"
-else
- database_adapter = "sqlite3"
-end
ActiveRecord::Base.default_timezone = :local
ActiveRecord::Base.logger = Logger.new(STDERR)
ActiveRecord::Base.logger.level = Logger::WARN
ActiveRecord::Base.establish_connection(
- :adapter => database_adapter,
+ :adapter => RUBY_PLATFORM == 'java' ? 'jdbcsqlite3' : 'sqlite3',
:database => ':memory:'
)
ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
|
Use ternary operator for brevity
|
diff --git a/src/Common/GeneratorField.php b/src/Common/GeneratorField.php
index <HASH>..<HASH> 100644
--- a/src/Common/GeneratorField.php
+++ b/src/Common/GeneratorField.php
@@ -105,9 +105,7 @@ class GeneratorField
} else {
$this->migrationText .= '->'.$functionName;
$this->migrationText .= '(';
- foreach ($inputParams as $param) {
- $this->migrationText .= ', '.$param;
- }
+ $this->migrationText .= implode(', ', $inputParams);
$this->migrationText .= ')';
}
}
|
#<I> minor fix for params in function
|
diff --git a/spec/support/helpers/model_helper.rb b/spec/support/helpers/model_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/support/helpers/model_helper.rb
+++ b/spec/support/helpers/model_helper.rb
@@ -57,7 +57,11 @@ module ModelHelper
when :mongo_mapper
MongoMapper::DocumentNotValid
when /mongoid/
- Mongoid::Errors::Validations
+ error_classes = [Mongoid::Errors::Validations]
+ error_classes << Moped::Errors::OperationFailure if defined?(::Moped) # Mongoid 4
+ error_classes << Mongo::Error::OperationFailure if defined?(::Mongo) # Mongoid 5
+
+ proc { |error| expect(error.class).to be_in(error_classes) }
else
raise "'#{DOORKEEPER_ORM}' ORM is not supported!"
end
|
Fix specs uniqueness check for Mongoid ORMs
|
diff --git a/supernova/supernova.py b/supernova/supernova.py
index <HASH>..<HASH> 100644
--- a/supernova/supernova.py
+++ b/supernova/supernova.py
@@ -55,16 +55,11 @@ class SuperNova(object):
msg = "[%s] Unable to locate section '%s' in your configuration."
print(msg % (colors.rwrap("Failed"), self.nova_env))
sys.exit(1)
- nova_re = re.compile(r"(^nova_|^os_|^novaclient|^trove_)")
proxy_re = re.compile(r"(^http_proxy|^https_proxy)")
creds = []
for param, value in raw_creds:
- # Skip parameters we're unfamiliar with
- if not nova_re.match(param) and not proxy_re.match(param):
- continue
-
if not proxy_re.match(param):
param = param.upper()
|
don't filter environment variables based on prefix.
This allows us to use supernova from clients that are not explicitly supported
|
diff --git a/compiler/lang.py b/compiler/lang.py
index <HASH>..<HASH> 100644
--- a/compiler/lang.py
+++ b/compiler/lang.py
@@ -18,7 +18,7 @@ def value_is_trivial(value):
if value[0] == '(' and value[-1] == ')':
value = value[1:-1]
- if value == 'true' or value == 'false' or value == 'null':
+ if value == 'true' or value == 'false' or value == 'null' or value == 'undefined' or value == 'this':
return True
if trivial_value_re.match(value):
|
handle undefined/null as trivial values
|
diff --git a/lib/dimples/version.rb b/lib/dimples/version.rb
index <HASH>..<HASH> 100644
--- a/lib/dimples/version.rb
+++ b/lib/dimples/version.rb
@@ -1,3 +1,3 @@
module Dimples
- VERSION = '1.7.1'.freeze
+ VERSION = '1.7.2'.freeze
end
|
Bumped to <I>.
|
diff --git a/test/plugin/test_out_google_cloud.rb b/test/plugin/test_out_google_cloud.rb
index <HASH>..<HASH> 100644
--- a/test/plugin/test_out_google_cloud.rb
+++ b/test/plugin/test_out_google_cloud.rb
@@ -400,6 +400,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
end
def test_one_log_ec2
+ ENV['GOOGLE_APPLICATION_CREDENTIALS'] = 'test/plugin/data/credentials.json'
setup_ec2_metadata_stubs
setup_logging_stubs
d = create_driver(CONFIG_EC2_PROJECT_ID)
|
Add missing credentials for EC2 logging test.
This test was picking up the credentials from my local filesystem
and succeeding, but failed on travis. Setting the credentials
explicitly makes it (properly) pass everywhere.
|
diff --git a/packages/ember-views/lib/system/render_buffer.js b/packages/ember-views/lib/system/render_buffer.js
index <HASH>..<HASH> 100644
--- a/packages/ember-views/lib/system/render_buffer.js
+++ b/packages/ember-views/lib/system/render_buffer.js
@@ -528,7 +528,10 @@ _RenderBuffer.prototype = {
this._element.appendChild(nodes[0]);
}
}
- this.hydrateMorphs(contextualElement);
+ // This should only happen with legacy string buffers
+ if (this.childViews.length > 0) {
+ this.hydrateMorphs(contextualElement);
+ }
return this._element;
},
|
[BUGFIX beta] Only start hydrating morphs if there are legacy childViews
|
diff --git a/android/src/main/java/com/tradle/react/UdpReceiverTask.java b/android/src/main/java/com/tradle/react/UdpReceiverTask.java
index <HASH>..<HASH> 100644
--- a/android/src/main/java/com/tradle/react/UdpReceiverTask.java
+++ b/android/src/main/java/com/tradle/react/UdpReceiverTask.java
@@ -47,7 +47,7 @@ public class UdpReceiverTask extends AsyncTask<Pair<DatagramSocket, UdpReceiverT
final InetAddress address = packet.getAddress();
final String base64Data = Base64.encodeToString(packet.getData(), packet.getOffset(),
packet.getLength(), Base64.NO_WRAP);
- receiverListener.didReceiveData(base64Data, address.getHostName(), packet.getPort());
+ receiverListener.didReceiveData(base64Data, address.getHostAddress(), packet.getPort());
} catch (IOException ioe) {
if (receiverListener != null) {
receiverListener.didReceiveError(ioe.getMessage());
|
Assure `host` is always an IP address (#<I>)
Use `InetAddress.getHostAddress()` instead of `InetAddress.getHostName()` to get the host IP. The second one sometimes returns a textual name of the local host and this info is not really useful as a source address unless there's a way to resolve that name.
|
diff --git a/webroot/js/embedded.js b/webroot/js/embedded.js
index <HASH>..<HASH> 100644
--- a/webroot/js/embedded.js
+++ b/webroot/js/embedded.js
@@ -49,6 +49,17 @@ var embedded = embedded || {};
var modalId = $(form).data('modal_id');
var url = $(form).attr('action');
+ var embedded = $(form).data('embedded');
+
+ $.each($(form).serializeArray(), function(i, field) {
+ if (0 === field.name.indexOf(embedded)) {
+ var name = field.name.replace(embedded, '');
+ name = name.replace('[', '');
+ name = name.replace(']', '');
+ data.append( name, field.value );
+ }
+ });
+
$.each(that.files, function(key, value)
{
data.append('file[]', value);
|
Fixed multiple data saving in File uploads for (task #<I>)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -21,4 +21,6 @@ setup(name='hashids',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
],)
|
Extend list of supported python versions
|
diff --git a/src/resources/purchases.js b/src/resources/purchases.js
index <HASH>..<HASH> 100644
--- a/src/resources/purchases.js
+++ b/src/resources/purchases.js
@@ -46,13 +46,24 @@ class Purchases extends ResourceBase {
async get(address) {
const contractData = await this.contractFn(address, 'data')
+
+ const ipfsHashBytes32 = contractData[5]
+ let ipfsData = {}
+ if (ipfsHashBytes32) {
+ const ipfsHash = this.contractService.getIpfsHashFromBytes32(
+ ipfsHashBytes32
+ )
+ ipfsData = await this.ipfsService.getFile(ipfsHash)
+ }
+
return {
address: address,
stage: _NUMBERS_TO_STAGE[contractData[0]],
listingAddress: contractData[1],
buyerAddress: contractData[2],
created: Number(contractData[3]),
- buyerTimeout: Number(contractData[4])
+ buyerTimeout: Number(contractData[4]),
+ ipfsData
}
}
|
Include IPFS data in purchases get method
|
diff --git a/trunk/JLanguageTool/src/java/de/danielnaber/languagetool/server/HTTPServer.java b/trunk/JLanguageTool/src/java/de/danielnaber/languagetool/server/HTTPServer.java
index <HASH>..<HASH> 100644
--- a/trunk/JLanguageTool/src/java/de/danielnaber/languagetool/server/HTTPServer.java
+++ b/trunk/JLanguageTool/src/java/de/danielnaber/languagetool/server/HTTPServer.java
@@ -208,6 +208,8 @@ public class HTTPServer extends ContentOracle {
* @throws UnsupportedEncodingException If character encoding needs to be consulted, but named character encoding is not supported
*/
private Map<String, String> getParamMap(Request connRequest) throws UnsupportedEncodingException {
+ if ((null == connRequest) || (null == connRequest.getParamString()))
+ return new HashMap<String, String>();
Map<String, String> paramMap = new HashMap<String, String>();
String[] comps = connRequest.getParamString().split("&");
for (int i = 0; i < comps.length; i++) {
|
Added some tests to validate request string.
|
diff --git a/lib/haibu/drone/index.js b/lib/haibu/drone/index.js
index <HASH>..<HASH> 100644
--- a/lib/haibu/drone/index.js
+++ b/lib/haibu/drone/index.js
@@ -166,6 +166,32 @@ exports.start = function (options, callback) {
}
function startHook (err) {
+ //
+ // There is a current bug in node that throws here:
+ //
+ // https://github.com/joyent/node/blob/v0.4.12/lib/net.js#L159
+ //
+ // It will throw a broken pipe error (EPIPE) when a child process that you
+ // are piping to unexpectedly exits. The write function on line 159 is
+ // defined here:
+ //
+ // https://github.com/joyent/node/blob/v0.4.12/lib/net.js#L62
+ //
+ // This uncaughtExceptionHandler will catch that error,
+ // and since it originated with in another sync context,
+ // this section will still respond to the request.
+ //
+ haibu.exceptions.logger.exitOnError = function (err) {
+ if (err.code === 'EPIPE') {
+ console.log('expected error:');
+ console.log('EPIPE -- probabaly caused by someone pushing a non gzip file.');
+ console.log('"net" throws on a broken pipe, current node bug, not haibu.');
+ return false;
+ }
+
+ return true;
+ }
+
return err
? callback(err)
: exports.startHook(options, startServer)
|
[minor] Add warning for supressed exception on EPIPE. This error is thrown in node@<I> when attempting to pipe a bad tarball to `haibu.config.get("tar")`
|
diff --git a/webdriver_test_tools/cmd/cmd.py b/webdriver_test_tools/cmd/cmd.py
index <HASH>..<HASH> 100644
--- a/webdriver_test_tools/cmd/cmd.py
+++ b/webdriver_test_tools/cmd/cmd.py
@@ -39,9 +39,6 @@ def print_validation_warning(text):
print(COLORS['warning'](text))
-# TODO: more print methods for other formats?
-
-
# User Input
class ValidationError(Exception):
diff --git a/webdriver_test_tools/version.py b/webdriver_test_tools/version.py
index <HASH>..<HASH> 100644
--- a/webdriver_test_tools/version.py
+++ b/webdriver_test_tools/version.py
@@ -11,3 +11,14 @@ __devstatus__ = 'Development Status :: 2 - Pre-Alpha'
__selenium__ = '3.11.0'
+
+def get_version_info():
+ """Returns a dictionary with version information about the webdriver_test_tools package
+
+ :return: Dictionary with keys 'version', 'devstatus', and 'selenium'
+ """
+ return {
+ 'version': __version__,
+ 'devstatus': __devstatus__,
+ 'selenium': __selenium__,
+ }
|
Added get_version_info() method to version submodule
Currently not yet implemented, but will be used to reduce accessing its
variables directly via import
|
diff --git a/public/build/js/bundle.js b/public/build/js/bundle.js
index <HASH>..<HASH> 100644
--- a/public/build/js/bundle.js
+++ b/public/build/js/bundle.js
@@ -23682,9 +23682,9 @@ var melisCore = (function(window){
$tabArrowTop.addClass("hide-arrow");
}
- /* if ( textUndefined === 'undefined' ) {
+ if ( textUndefined === 'undefined' ) {
$title.hide();
- } */
+ }
}
// OPEN TOOLS - opens the tools from the sidebar
@@ -31827,7 +31827,7 @@ var dashboardNotify = (function() {
*
* src: https://stackoverflow.com/a/22479460/7870472
*/
- var MAX_COOKIE_AGE = 2147483647;
+ var MAX_COOKIE_AGE = 2147483647000;
// cache DOM
var $body = $("body"),
|
fix on undefined right side mobile responsive menu
|
diff --git a/tika/tika.py b/tika/tika.py
index <HASH>..<HASH> 100644
--- a/tika/tika.py
+++ b/tika/tika.py
@@ -61,7 +61,7 @@ Example usage as python client:
import sys, os, getopt, time
try:
- unicode_string = unicode
+ unicode_string = 'utf_8'
binary_string = str
except NameError:
unicode_string = str
@@ -451,4 +451,4 @@ if __name__ == '__main__':
if type(resp) == list:
print('\n'.join([r[1] for r in resp]))
else:
- print resp
+ print(resp)
|
fix: removed errors in running python3
|
diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java
index <HASH>..<HASH> 100644
--- a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java
+++ b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java
@@ -80,6 +80,7 @@ public class TestServiceClient {
} finally {
client.tearDown();
}
+ System.exit(0);
}
private String serverHost = "localhost";
|
Use exit() for integration test client
On my machine, the client currently takes ~3s to run a test. However,
with exit() it takes < 1s. When doing lots of integration tests, those
seconds add up.
We know one of those seconds is the DESTROY_DELAY_SECONDS of
SharedResourceHolder. Part of another second appears to be Netty
creating any threads that weren't previously created when shutting down.
|
diff --git a/angr/variableseekr.py b/angr/variableseekr.py
index <HASH>..<HASH> 100644
--- a/angr/variableseekr.py
+++ b/angr/variableseekr.py
@@ -226,7 +226,7 @@ class VariableSeekr(object):
irsb = current_run
memory = irsb.exits()[0].state.memory
- events = memory.events('uninitialized')
+ events = memory.state.log.events_of_type('uninitialized')
print events
for region_id, region in memory.regions.items():
if region.is_stack:
@@ -362,4 +362,4 @@ class VariableSeekr(object):
else:
return None
-from .errors import AngrInvalidArgumentError
\ No newline at end of file
+from .errors import AngrInvalidArgumentError
|
adapted variableseekr to use the state event log for printing out uninitialized reads (although htis code should be moved elsewhere, anyways)
|
diff --git a/lib/bitescript/builder.rb b/lib/bitescript/builder.rb
index <HASH>..<HASH> 100644
--- a/lib/bitescript/builder.rb
+++ b/lib/bitescript/builder.rb
@@ -333,7 +333,28 @@ module BiteScript
def static_init(&block)
method(Opcodes::ACC_STATIC, "<clinit>", [void], [], &block)
end
-
+
+ def build_method(name, visibility, static, exceptions, type, *args)
+ flags =
+ case visibility
+ when :public; Opcodes::ACC_PUBLIC
+ when :private; Opcodes::ACC_PRIVATE
+ when :protected; Opcodes::ACC_PROTECTED
+ end
+ flags |= Opcodes::ACC_STATIC if static
+ method(flags, name, [type, *args], exceptions)
+ end
+
+ def build_constructor(visibility, exceptions, *args)
+ flags =
+ case visibility
+ when :public; Opcodes::ACC_PUBLIC
+ when :private; Opcodes::ACC_PRIVATE
+ when :protected; Opcodes::ACC_PROTECTED
+ end
+ @constructor = method(flags, "<init>", [nil, *args], exceptions)
+ end
+
def method(flags, name, signature, exceptions, &block)
flags |= Opcodes::ACC_ABSTRACT if interface?
mb = MethodBuilder.new(self, flags, name, exceptions, signature)
|
Add more general methods for declaring methods and constructors.
|
diff --git a/value.go b/value.go
index <HASH>..<HASH> 100644
--- a/value.go
+++ b/value.go
@@ -475,7 +475,18 @@ func (fn *Function) String() string { return toString(fn) }
func (fn *Function) Type() string { return "function" }
func (fn *Function) Truth() Bool { return true }
-func (fn *Function) Syntax() *syntax.Function { return fn.syntax }
+// syntax accessors
+//
+// We do not expose the syntax tree; future versions of Function may dispense with it.
+
+func (fn *Function) Position() syntax.Position { return fn.position }
+func (fn *Function) NumParams() int { return len(fn.syntax.Params) }
+func (fn *Function) Param(i int) (string, syntax.Position) {
+ id := fn.syntax.Locals[i]
+ return id.Name, id.NamePos
+}
+func (fn *Function) HasVarargs() bool { return fn.syntax.HasVarargs }
+func (fn *Function) HasKwargs() bool { return fn.syntax.HasKwargs }
// A Builtin is a function implemented in Go.
type Builtin struct {
|
evaluator: replace Function.Syntax method with accessors (#<I>)
* evaluator: replace Function.Syntax method with accessors
Future versions of Function may not have a syntax tree.
This is a breaking API change.
|
diff --git a/src/Wrep/Notificare/Tests/Apns/SenderTest.php b/src/Wrep/Notificare/Tests/Apns/SenderTest.php
index <HASH>..<HASH> 100644
--- a/src/Wrep/Notificare/Tests/Apns/SenderTest.php
+++ b/src/Wrep/Notificare/Tests/Apns/SenderTest.php
@@ -65,7 +65,7 @@ class SenderTests extends \PHPUnit_Framework_TestCase
{
return array(
// Add a valid certificate and pushtoken here to run this test
- array(new Certificate(__DIR__ . '/../resources/paspas.pem'), '95e3097b302dd0634c4300d0386b582efc51d740bb8869412a73b52c0fda6d7c')
+ //array(new Certificate(__DIR__ . '/../resources/paspas.pem'), '95e3097b302dd0634c4300d0386b582efc51d740bb8869412a73b52c0fda6d7c')
);
}
}
\ No newline at end of file
|
Comment out the cert that isn't available for everybody
|
diff --git a/ppb/systems/inputs.py b/ppb/systems/inputs.py
index <HASH>..<HASH> 100644
--- a/ppb/systems/inputs.py
+++ b/ppb/systems/inputs.py
@@ -26,7 +26,7 @@ class EventPoller(SdlSubSystem):
"""
An event poller that converts Pygame events into PPB events.
"""
- _subsystems = SDL_INIT_EVENTS
+ _sdl_subsystems = SDL_INIT_EVENTS
event_map = {
SDL_QUIT: "quit",
|
ppb.systems.input: Typo'd "_sdl_subsystems"
|
diff --git a/decidim-core/app/cells/decidim/coauthorships_cell.rb b/decidim-core/app/cells/decidim/coauthorships_cell.rb
index <HASH>..<HASH> 100644
--- a/decidim-core/app/cells/decidim/coauthorships_cell.rb
+++ b/decidim-core/app/cells/decidim/coauthorships_cell.rb
@@ -19,7 +19,7 @@ module Decidim
include Decidim::ApplicationHelper
def show
- if authorable? || official?
+ if authorable?
cell "decidim/author", presenter_for_author(model), extra_classes.merge(has_actions: has_actions?, from: model)
else
cell(
@@ -41,7 +41,13 @@ module Decidim
end
def presenters_for_identities(coauthorable)
- coauthorable.identities.map { |identity| present(identity) }
+ coauthorable.identities.map do |identity|
+ if identity.is_a?(Decidim::Organization)
+ "#{model.class.parent}::OfficialAuthorPresenter".constantize.new
+ else
+ present(identity)
+ end
+ end
end
def presenter_for_author(authorable)
|
Update coauthorships_cell.rb (#<I>)
|
diff --git a/molo/profiles/forms.py b/molo/profiles/forms.py
index <HASH>..<HASH> 100644
--- a/molo/profiles/forms.py
+++ b/molo/profiles/forms.py
@@ -109,7 +109,7 @@ class DateOfBirthValidationMixin(object):
except ValueError:
date_of_birth = None
- if self.profile_settings.dob_required and not date_of_birth:
+ if self.fields['date_of_birth'].required and not date_of_birth:
err = _("This field is required.")
raise forms.ValidationError(err)
|
Check if dob is required by the form, not by the settings
|
diff --git a/src/abeautifulsite/SimpleImage.php b/src/abeautifulsite/SimpleImage.php
index <HASH>..<HASH> 100644
--- a/src/abeautifulsite/SimpleImage.php
+++ b/src/abeautifulsite/SimpleImage.php
@@ -658,7 +658,7 @@ class SimpleImage {
$imagestring = ob_get_contents();
ob_end_clean();
- return [ $mimetype, $imagestring ];
+ return array($mimetype, $imagestring);
}
/**
@@ -1441,4 +1441,4 @@ class SimpleImage {
return false;
}
-}
\ No newline at end of file
+}
|
PHP <I> Support (#<I>)
For PHP <I> support, we must not use bracket arrays. Fixed a bracket array .
|
diff --git a/src/main/java/hudson/plugins/groovy/Groovy.java b/src/main/java/hudson/plugins/groovy/Groovy.java
index <HASH>..<HASH> 100644
--- a/src/main/java/hudson/plugins/groovy/Groovy.java
+++ b/src/main/java/hudson/plugins/groovy/Groovy.java
@@ -222,11 +222,16 @@ public class Groovy extends AbstractGroovy {
}
private File getExeFile(String execName) {
- if (File.separatorChar == '\\') {
- execName += ".exe";
- }
String groovyHome = Util.replaceMacro(getHome(),EnvVars.masterEnvVars);
- return new File(groovyHome, "bin/" + execName);
+ File binDir = new File(groovyHome, "bin/");
+ if (File.separatorChar == '\\') {
+ if(new File(binDir, execName + ".exe").exists()) {
+ execName += ".exe";
+ } else {
+ execName += ".bat";
+ }
+ }
+ return new File(binDir, execName);
}
/**
|
Support for *.bat executable on windows, applied patch from HUDSON-<I>
|
diff --git a/synapse/lib/remcycle.py b/synapse/lib/remcycle.py
index <HASH>..<HASH> 100644
--- a/synapse/lib/remcycle.py
+++ b/synapse/lib/remcycle.py
@@ -492,6 +492,7 @@ class Hypnos(s_config.Config):
# Stamp api http config ontop of global config, then stamp it into the API config
_http = self.global_request_headers[_namespace].copy()
_http.update(val.get('http', {}))
+ val['http'] = _http
nyx_obj = Nyx(config=val)
self._register_api(name=name, obj=nyx_obj)
self.namespaces.add(_namespace)
|
Fix a issue where the global http config was not carried into the api config
|
diff --git a/gcs/bucket.go b/gcs/bucket.go
index <HASH>..<HASH> 100644
--- a/gcs/bucket.go
+++ b/gcs/bucket.go
@@ -219,8 +219,9 @@ func (b *bucket) NewReader(
}
url := &url.URL{
- Scheme: "https",
- Opaque: opaque,
+ Scheme: "https",
+ Opaque: opaque,
+ RawQuery: query.Encode(),
}
// Create an HTTP request.
|
Fixed a bug introduced in bf<I>d1e<I>bace<I>ae6ce<I>f<I>eecd<I>.
|
diff --git a/lib/mysql2/client.rb b/lib/mysql2/client.rb
index <HASH>..<HASH> 100644
--- a/lib/mysql2/client.rb
+++ b/lib/mysql2/client.rb
@@ -1,6 +1,6 @@
module Mysql2
class Client
- attr_reader :query_options, :read_timeout
+ attr_reader :query_options, :read_timeout, :write_timeout, :local_infile
@@default_query_options = {
:as => :hash, # the type of object you want each row back as; also supports :array (an array of values)
:async => false, # don't wait for a result after sending the query, you'll have to monitor the socket yourself then eventually call Mysql2::Client#async_result
@@ -16,6 +16,8 @@ module Mysql2
def initialize(opts = {})
opts = Mysql2::Util.key_hash_as_symbols( opts )
@read_timeout = nil
+ @write_timeout = nil
+ @local_infile = nil
@query_options = @@default_query_options.dup
@query_options.merge! opts
|
make sure write_timeout and local_infile ivars are setup to avoid warnings
|
diff --git a/data/models-ios.php b/data/models-ios.php
index <HASH>..<HASH> 100644
--- a/data/models-ios.php
+++ b/data/models-ios.php
@@ -49,6 +49,7 @@ DeviceModels::$IOS_MODELS = [
'iPhone10,3' => [ 'Apple', 'iPhone X', DeviceType::MOBILE ],
'iPhone10,4' => [ 'Apple', 'iPhone 8', DeviceType::MOBILE ],
'iPhone10,5' => [ 'Apple', 'iPhone 8 Plus', DeviceType::MOBILE ],
+ 'iPhone10,6' => [ 'Apple', 'iPhone X', DeviceType::MOBILE ],
'iPhone11,2' => [ 'Apple', 'iPhone XS', DeviceType::MOBILE ],
'iPhone11,4' => [ 'Apple', 'iPhone XS Max', DeviceType::MOBILE ],
'iPhone11,6' => [ 'Apple', 'iPhone XS Max', DeviceType::MOBILE ],
|
Re-add iPhone X after mistakenly removing it
|
diff --git a/command/agent/command.go b/command/agent/command.go
index <HASH>..<HASH> 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -153,6 +153,7 @@ func (c *Command) Run(args []string, rawUi cli.Ui) int {
ui.Info(fmt.Sprintf("Node name: '%s'", config.NodeName))
ui.Info(fmt.Sprintf("Bind addr: '%s:%d'", bindIP, bindPort))
ui.Info(fmt.Sprintf(" RPC addr: '%s'", config.RPCAddr))
+ ui.Info(fmt.Sprintf("Encrypted: %#v", config.EncryptKey != ""))
if len(config.StartJoin) > 0 {
ui.Output("Joining cluster...")
|
command/agent: output whether encryption is enabled
|
diff --git a/progressbar/widgets.py b/progressbar/widgets.py
index <HASH>..<HASH> 100644
--- a/progressbar/widgets.py
+++ b/progressbar/widgets.py
@@ -137,10 +137,12 @@ class AdaptiveETA(ETA):
ETA.__init__(self)
self.num_samples = num_samples
self.samples = []
+ self.sample_vals = []
self.last_sample_val = None
def _eta(self, pbar):
samples = self.samples
+ sample_vals = self.sample_vals
if pbar.currval != self.last_sample_val:
# Update the last sample counter, we only update if currval has
# changed
@@ -148,15 +150,18 @@ class AdaptiveETA(ETA):
# Add a sample but limit the size to `num_samples`
samples.append(pbar.seconds_elapsed)
+ sample_vals.append(pbar.currval)
if len(samples) > self.num_samples:
samples.pop(0)
+ sample_vals.pop(0)
if len(samples) <= 1:
# No samples so just return the normal ETA calculation
return ETA._eta(self, pbar)
todo = pbar.maxval - pbar.currval
- per_item = float(samples[-1] - samples[0]) / len(samples)
+ items = samples[-1] - samples[0]
+ per_item = float(samples[-1] - samples[0]) / items
return todo * per_item
|
fixed inaccuracy for adaptive ETA when not all items get sent
|
diff --git a/test/Application_test.py b/test/Application_test.py
index <HASH>..<HASH> 100644
--- a/test/Application_test.py
+++ b/test/Application_test.py
@@ -18,3 +18,6 @@ class TestApplicationClass(unittest.TestCase):
def test_none(self):
pass
+
+if __name__ == '__main__':
+ unittest.main()
|
Update notes and config files for Mac / Xcode 5.
svn r<I>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -201,7 +201,7 @@ CassandraStore.prototype.queryTileAsync = function(options) {
throw new Error('Options must contain an integer idx parameter');
var maxEnd = Math.pow(4, options.zoom);
if (options.idx < 0 || options.idx >= maxEnd)
- throw new Error('Options must satisfy: 0 <= idx < ' + maxEnd);
+ throw new Error('Options must satisfy: 0 <= idx < ' + maxEnd + ', requestd idx=' + options.idx);
getTile = typeof options.getTile === 'undefined' ? true : options.getTile;
getWriteTime = typeof options.getWriteTime === 'undefined' ? false : options.getWriteTime;
getSize = typeof options.getSize === 'undefined' ? false : options.getSize;
|
Better error reporting for bad idx
|
diff --git a/lib/sass/util.rb b/lib/sass/util.rb
index <HASH>..<HASH> 100644
--- a/lib/sass/util.rb
+++ b/lib/sass/util.rb
@@ -568,7 +568,7 @@ MSG
Regexp.new(/\A(?:#{_enc("\uFEFF", e)})?#{
_enc('@charset "', e)}(.*?)#{_enc('"', e)}|\A(#{
_enc("\uFEFF", e)})/)
- rescue Encoding::ConverterNotFound => _
+ rescue Encoding::ConverterNotFoundError => _
nil # JRuby on Java 5 doesn't support UTF-32
rescue
# /\A@charset "(.*?)"/
|
Don't die if a UTF encoding isn't supported.
f1a<I>a<I>c<I>dcb<I>aa<I>e<I>b incorrectly introduced a missing
constant. It should be Encoding::ConverterNotFoundError.
|
diff --git a/fake_filesystem_test.py b/fake_filesystem_test.py
index <HASH>..<HASH> 100755
--- a/fake_filesystem_test.py
+++ b/fake_filesystem_test.py
@@ -3293,11 +3293,7 @@ class DiskSpaceTest(TestCase):
self.assertEqual((100, 5, 95), self.filesystem.GetDiskUsage())
def testFileSystemSizeAfterAsciiStringFileCreation(self):
- if sys.version_info < (3, 0):
- contents = u'complicated'
- else:
- contents = 'complicated'
- self.filesystem.CreateFile('/foo/bar', contents=contents)
+ self.filesystem.CreateFile('/foo/bar', contents='complicated')
self.assertEqual((100, 11, 89), self.filesystem.GetDiskUsage())
def testFileSystemSizeAfter2ByteUnicodeStringFileCreation(self):
|
Second go to fix the test
- do not use unicode in Python 2
|
diff --git a/simulator/src/test/java/com/hazelcast/simulator/protocol/connector/WorkerConnectorTest.java b/simulator/src/test/java/com/hazelcast/simulator/protocol/connector/WorkerConnectorTest.java
index <HASH>..<HASH> 100644
--- a/simulator/src/test/java/com/hazelcast/simulator/protocol/connector/WorkerConnectorTest.java
+++ b/simulator/src/test/java/com/hazelcast/simulator/protocol/connector/WorkerConnectorTest.java
@@ -39,6 +39,7 @@ public class WorkerConnectorTest {
assertEquals(WORKER_INDEX, address.getWorkerIndex());
assertEquals(AGENT_INDEX, address.getAgentIndex());
+ assertEquals(0, connector.getMessageQueueSize());
assertEquals(PORT, connector.getPort());
assertEquals(WorkerOperationProcessor.class, connector.getProcessor().getClass());
}
|
Increased code coverage of WorkerConnector.
|
diff --git a/lib/bulk/common.js b/lib/bulk/common.js
index <HASH>..<HASH> 100644
--- a/lib/bulk/common.js
+++ b/lib/bulk/common.js
@@ -13,10 +13,7 @@ const executeOperation = require('../utils').executeOperation;
const isPromiseLike = require('../utils').isPromiseLike;
// Error codes
-const UNKNOWN_ERROR = 8;
-const INVALID_BSON_ERROR = 22;
const WRITE_CONCERN_ERROR = 64;
-const MULTIPLE_ERROR = 65;
// Insert types
const INSERT = 1;
@@ -1145,20 +1142,8 @@ Object.defineProperty(BulkOperationBase.prototype, 'length', {
module.exports = {
Batch,
BulkOperationBase,
- BulkWriteError,
- BulkWriteResult,
bson,
- FindOperators,
- handleMongoWriteConcernError,
- LegacyOp,
- mergeBatchResults,
- INVALID_BSON_ERROR: INVALID_BSON_ERROR,
- MULTIPLE_ERROR: MULTIPLE_ERROR,
- UNKNOWN_ERROR: UNKNOWN_ERROR,
- WRITE_CONCERN_ERROR: WRITE_CONCERN_ERROR,
INSERT: INSERT,
UPDATE: UPDATE,
- REMOVE: REMOVE,
- WriteError,
- WriteConcernError
+ REMOVE: REMOVE
};
|
refactor(BulkOp): remove code that is not used
|
diff --git a/src/com/google/javascript/jscomp/AstValidator.java b/src/com/google/javascript/jscomp/AstValidator.java
index <HASH>..<HASH> 100644
--- a/src/com/google/javascript/jscomp/AstValidator.java
+++ b/src/com/google/javascript/jscomp/AstValidator.java
@@ -293,6 +293,7 @@ public final class AstValidator implements CompilerPass {
case MUL:
case MOD:
case DIV:
+ case EXPONENT:
validateBinaryOp(n);
return;
|
Update AstValidator for exponentiation operator.
Also add some missing default cases to switch statements.
-------------
Created by MOE: <URL>
|
diff --git a/tests/Backend/CommonPart1/AlterTableTest.php b/tests/Backend/CommonPart1/AlterTableTest.php
index <HASH>..<HASH> 100644
--- a/tests/Backend/CommonPart1/AlterTableTest.php
+++ b/tests/Backend/CommonPart1/AlterTableTest.php
@@ -79,7 +79,7 @@ class AlterTableTest extends StorageApiTestCase
return [
[
'_abc-def----ghi_',
- 'abc_def_ghi',
+ 'abc_def_ghi_',
],
[
'žluťoučký kůň',
@@ -87,7 +87,7 @@ class AlterTableTest extends StorageApiTestCase
],
[
'lot__of_____underscores____',
- 'lot__of_____underscores',
+ 'lot__of_____underscores____',
]
];
}
|
fix expected columns names after webalize
|
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NspAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NspAnalyzer.java
index <HASH>..<HASH> 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NspAnalyzer.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NspAnalyzer.java
@@ -269,6 +269,7 @@ public class NspAnalyzer extends AbstractFileTypeAnalyzer {
nodeModule.setEcosystem(DEPENDENCY_ECOSYSTEM);
//this is virtual - the sha1 is purely for the hyperlink in the final html report
nodeModule.setSha1sum(Checksum.getSHA1Checksum(String.format("%s:%s", name, version)));
+ nodeModule.setMd5sum(Checksum.getMD5Checksum(String.format("%s:%s", name, version)));
nodeModule.addEvidence(EvidenceType.PRODUCT, "package.json", "name", name, Confidence.HIGHEST);
nodeModule.addEvidence(EvidenceType.VENDOR, "package.json", "name", name, Confidence.HIGH);
nodeModule.addEvidence(EvidenceType.VERSION, "package.json", "version", version, Confidence.HIGHEST);
|
updated as this would end up similiar to #<I>
|
diff --git a/src/segments/tokenizer.py b/src/segments/tokenizer.py
index <HASH>..<HASH> 100644
--- a/src/segments/tokenizer.py
+++ b/src/segments/tokenizer.py
@@ -323,7 +323,7 @@ class Tokenizer(object):
continue
else:
if unicodedata.category(result[-1][0]) == "Sk":
- result[-1] = grapheme + result[-1]
+ result[-1] = grapheme + temp + result[-1]
temp = ""
continue
|
Vietnamese tone contour grouping (#<I>)
* potential fix to deal with Vietnamese problem
* updated solution to Vietnamese problem
|
diff --git a/pulsar/async/defer.py b/pulsar/async/defer.py
index <HASH>..<HASH> 100755
--- a/pulsar/async/defer.py
+++ b/pulsar/async/defer.py
@@ -595,7 +595,7 @@ function when a generator is passed as argument.'''
elif last_result is not self.errors:
self.errors.append(last_result)
if self.max_errors and len(self.errors) >= self.max_errors:
- return self._conclude()
+ return self._conclude(last_result)
try:
result = self.gen.send(last_result)
except StopIteration:
@@ -617,13 +617,11 @@ function when a generator is passed as argument.'''
# the passed result (which is not asynchronous).
return result
- def _conclude(self, last_result=None):
+ def _conclude(self, last_result):
# Conclude the generator and callback the listeners
- #result = last_result if not self.errors else self.errors
- result = last_result
del self.gen
del self.errors
- return self.callback(result)
+ return self.callback(last_result)
############################################################### MultiDeferred
class MultiDeferred(Deferred):
|
deferredcoroutine conclude by calling back the last result
|
diff --git a/IPython/html/static/notebook/js/widgets/multicontainer.js b/IPython/html/static/notebook/js/widgets/multicontainer.js
index <HASH>..<HASH> 100644
--- a/IPython/html/static/notebook/js/widgets/multicontainer.js
+++ b/IPython/html/static/notebook/js/widgets/multicontainer.js
@@ -22,9 +22,9 @@ define(["notebook/js/widget"], function(widget_manager){
render: function(){
var guid = 'accordion' + IPython.utils.uuid();
- this.$el = $('<div />', {id: guid})
+ this.$el
+ .attr('id', guid)
.addClass('accordion');
- this._ensureElement();
this.containers = [];
},
|
Fixed backbone event handling for accordion view
|
diff --git a/lib/sidekiq-unique-jobs.rb b/lib/sidekiq-unique-jobs.rb
index <HASH>..<HASH> 100644
--- a/lib/sidekiq-unique-jobs.rb
+++ b/lib/sidekiq-unique-jobs.rb
@@ -56,7 +56,7 @@ module SidekiqUniqueJobs
end
def redis_version
- @redis_version ||= connection { |c| c.info('server')['redis_version'] }
+ @redis_version ||= connection { |c| c.info('server'.freeze)['redis_version'.freeze] }
end
def connection(redis_pool = nil)
@@ -67,10 +67,6 @@ module SidekiqUniqueJobs
end
end
- def mock_redis
- @redis_mock ||= MockRedis.new if defined?(MockRedis)
- end
-
def synchronize(item, redis_pool)
Lock::WhileExecuting.synchronize(item, redis_pool) { yield }
end
|
Remove mock_redis completely
Not in use anymore
|
diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py
index <HASH>..<HASH> 100644
--- a/sos/plugins/samba.py
+++ b/sos/plugins/samba.py
@@ -34,10 +34,10 @@ class Samba(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
self.add_copy_spec("/var/log/samba/")
self.add_cmd_output([
- "wbinfo --domain='.' -g",
- "wbinfo --domain='.' -u",
- "wbinfo --trusted-domains --verbose",
"testparm -s",
+ "wbinfo --domain='.' --domain-users",
+ "wbinfo --domain='.' --domain-groups",
+ "wbinfo --trusted-domains --verbose",
])
|
[samba] Use verbose names and get testparm output first
Related: #<I>
|
diff --git a/gui/src/main/java/org/jboss/as/console/client/shared/subsys/ejb3/model/StrictMaxBeanPool.java b/gui/src/main/java/org/jboss/as/console/client/shared/subsys/ejb3/model/StrictMaxBeanPool.java
index <HASH>..<HASH> 100644
--- a/gui/src/main/java/org/jboss/as/console/client/shared/subsys/ejb3/model/StrictMaxBeanPool.java
+++ b/gui/src/main/java/org/jboss/as/console/client/shared/subsys/ejb3/model/StrictMaxBeanPool.java
@@ -55,7 +55,8 @@ public interface StrictMaxBeanPool extends NamedEntity {
void setTimeout(long timeout);
@Binding(detypedName="timeout-unit")
- @FormItem(formItemTypeForEdit="UNITS")
+ @FormItem(defaultValue="MINUTES",
+ formItemTypeForEdit="UNITS")
String getTimeoutUnit();
void setTimeoutUnit(String unit);
}
|
AS7-<I> Fix for failure to add EJB3 pool
Added missing default to model.
|
diff --git a/saltcloud/clouds/ec2.py b/saltcloud/clouds/ec2.py
index <HASH>..<HASH> 100644
--- a/saltcloud/clouds/ec2.py
+++ b/saltcloud/clouds/ec2.py
@@ -612,6 +612,9 @@ def create(vm_=None, call=None):
key_filename=__opts__['EC2.private_key']):
username = user
break
+ else:
+ return {vm_['name']: 'Failed to authenticate'}
+
sudo = True
if 'sudo' in vm_.keys():
sudo = vm_['sudo']
|
Fix `UnboundLocalError` when failed to authenticated using SSH with EC2.
|
diff --git a/ai/methods.py b/ai/methods.py
index <HASH>..<HASH> 100644
--- a/ai/methods.py
+++ b/ai/methods.py
@@ -128,16 +128,20 @@ def _search(problem, fringe, graph_search=False, depth_limit=None,
if problem.is_goal(node.state):
return node
if depth_limit is None or node.depth < depth_limit:
- childs = node.expand()
- if filter_nodes:
- childs = filter_nodes(problem, node, childs)
- for n in childs:
+ childs = []
+ for n in node.expand():
if graph_search:
if n.state not in memory:
memory.add(n.state)
- fringe.append(n)
+ childs.append(n)
else:
- fringe.append(n)
+ childs.append(n)
+
+ if filter_nodes:
+ childs = filter_nodes(problem, node, childs)
+
+ for n in childs:
+ fringe.append(n)
# Math literally copied from aima-python
|
Fixed problem between node filtering and memory of nodes
|
diff --git a/phydmslib/treelikelihood.py b/phydmslib/treelikelihood.py
index <HASH>..<HASH> 100644
--- a/phydmslib/treelikelihood.py
+++ b/phydmslib/treelikelihood.py
@@ -268,6 +268,7 @@ class TreeLikelihood:
bounds.append(self.model.PARAMLIMITS[param[0]])
else:
raise ValueError("Invalid param type")
+ bounds = [(tup[0] + ALMOST_ZERO, tup[1] - ALMOST_ZERO) for tup in bounds]
assert len(bounds) == len(self._index_to_param)
return tuple(bounds)
@@ -359,7 +360,8 @@ class TreeLikelihood:
if modelparams:
self.model.updateParams(modelparams)
if otherparams:
- raise RuntimeError("cannot currently handle non-model params")
+ raise RuntimeError("Cannot handle non-model params: {0}".format(
+ otherparams))
if newvalues:
self._updateInternals()
self._paramsarray = None
|
Added margins on parameter bounds for optimization
The bounds on the L-BFGS optimizer seem to sometimes
get slightly exceeded. Now the lower bound is + ALMOST_ZERO
and the upper bound is - ALMOST_ZERO to avoid this problem.
|
diff --git a/halogen/types.py b/halogen/types.py
index <HASH>..<HASH> 100644
--- a/halogen/types.py
+++ b/halogen/types.py
@@ -27,10 +27,15 @@ class List(Type):
"""List type for Halogen schema attribute."""
- def __init__(self, item_type=None):
- """Create a new List."""
+ def __init__(self, item_type=None, allow_scalar=False):
+ """Create a new List.
+
+ :param item_type: Item type or schema.
+ :param allow_scalar: Automatically convert scalar value to the list.
+ """
super(List, self).__init__()
self.item_type = item_type or Type
+ self.allow_scalar = allow_scalar
def serialize(self, value, **kwargs):
"""Serialize every item of the list."""
@@ -38,4 +43,6 @@ class List(Type):
def deserialize(self, value, **kwargs):
"""Deserialize every item of the list."""
+ if self.allow_scalar and not isinstance(value, (list, tuple)):
+ value = [value]
return [self.item_type.deserialize(val, **kwargs) for val in value]
|
allow scalar in the list
|
diff --git a/renku/core/__init__.py b/renku/core/__init__.py
index <HASH>..<HASH> 100644
--- a/renku/core/__init__.py
+++ b/renku/core/__init__.py
@@ -16,3 +16,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Renku core."""
+import logging
+
+logging.getLogger('py-filelock.filelock').setLevel(logging.ERROR)
|
chore(core): set filelock logging to warning (#<I>)
|
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index <HASH>..<HASH> 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,7 +8,6 @@
* PHP version 5
* @package MetaModels
* @subpackage Tests
- * @author Christian Schiffler <[email protected]>
* @author Christopher Boelter <[email protected]>
* @copyright The MetaModels team.
* @license LGPL.
|
added missing languages, removed author from boostrap.php
|
diff --git a/Lib/RelativeTime/Languages/French.php b/Lib/RelativeTime/Languages/French.php
index <HASH>..<HASH> 100644
--- a/Lib/RelativeTime/Languages/French.php
+++ b/Lib/RelativeTime/Languages/French.php
@@ -19,7 +19,7 @@ class French extends LanguageAdapter
{
protected $strings = array(
'now' => 'maintenant',
- 'ago' => 'depuis %s',
+ 'ago' => 'il y a %s',
'left' => '%s restant',
'seconds' => array(
'plural' => '%d secondes',
|
French: Replace "depuis" with "il y a"
The original translation from <I> translated "2 seconds ago" as
"since 2 seconds". Which is inaccurate since every single
French I've seen translated it to (literally) "there are 2 seconds".
|
diff --git a/SEOstats/Config/Services.php b/SEOstats/Config/Services.php
index <HASH>..<HASH> 100644
--- a/SEOstats/Config/Services.php
+++ b/SEOstats/Config/Services.php
@@ -41,7 +41,7 @@ interface Services
const GOOGLE_APISEARCH_URL = 'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz=%s&q=%s';
// Google Pagespeed Insights API Endpoint.
- const GOOGLE_PAGESPEED_URL = 'https://www.googleapis.com/pagespeedonline/v1/runPagespeed?url=%s&key=%s';
+ const GOOGLE_PAGESPEED_URL = 'https://www.googleapis.com/pagespeedonline/v2/runPagespeed?url=%s&strategy=%s&key=%s';
// Google +1 Fastbutton URL.
const GOOGLE_PLUSONE_URL = 'https://plusone.google.com/u/0/_/+1/fastbutton?count=true&url=%s';
|
Update pagespeed URL to 'v2', include strategy
|
diff --git a/lib/fog/vcloud_director/models/compute/vm.rb b/lib/fog/vcloud_director/models/compute/vm.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/vcloud_director/models/compute/vm.rb
+++ b/lib/fog/vcloud_director/models/compute/vm.rb
@@ -90,6 +90,17 @@ module Fog
service.process_task(response.body)
end
+ def undeploy
+ requires :id
+ begin
+ response = service.post_undeploy_vapp(id)
+ rescue Fog::Compute::VcloudDirector::BadRequest => ex
+ Fog::Logger.debug(ex.message)
+ return false
+ end
+ service.process_task(response.body)
+ end
+
# Shut down the VM.
def shutdown
requires :id
|
Power off leaves it in 'Partially Running' state. VMs must be fully OFF when deleting them with recompose.
|
diff --git a/cougar-framework/cougar-util/src/main/java/com/betfair/cougar/util/geolocation/RemoteAddressUtils.java b/cougar-framework/cougar-util/src/main/java/com/betfair/cougar/util/geolocation/RemoteAddressUtils.java
index <HASH>..<HASH> 100644
--- a/cougar-framework/cougar-util/src/main/java/com/betfair/cougar/util/geolocation/RemoteAddressUtils.java
+++ b/cougar-framework/cougar-util/src/main/java/com/betfair/cougar/util/geolocation/RemoteAddressUtils.java
@@ -42,7 +42,7 @@ public class RemoteAddressUtils {
StringBuilder localAddresses = new StringBuilder();
Enumeration<NetworkInterface> enumeration = NetworkInterface.getNetworkInterfaces();
if (enumeration == null) {
- throw new RuntimeException("Failed to retrieve any network interfaces");
+ throw new RuntimeException("Failed to retrieve any network interfaces, consider setting system property \"cougar.addressUtils.allowLoopBackIfNoOthers\" to true");
}
// we only use this if there are no others and we're willing to accept the loopback
NetworkInterface loopback = null;
|
#<I> implemented via double headers (X-UUID and X-UUID-Parents) and a new socket protocol version (5) to ensure backwards compatibility. Includes unit and integration tests following the new style started in #<I>
|
diff --git a/sportsreference/ncaaf/boxscore.py b/sportsreference/ncaaf/boxscore.py
index <HASH>..<HASH> 100644
--- a/sportsreference/ncaaf/boxscore.py
+++ b/sportsreference/ncaaf/boxscore.py
@@ -700,8 +700,9 @@ class Boxscore:
values. The index for the DataFrame is the string URI that is used to
instantiate the class, such as '2018-01-08-georgia'.
"""
- if self._away_points is None and self._home_points is None:
- return None
+ for points in [self._away_points, self._home_points]:
+ if points is None or points == '':
+ return None
fields_to_include = {
'away_first_downs': self.away_first_downs,
'away_fumbles': self.away_fumbles,
|
Fix issue with boxscores throwing errors
For games that are yet to occur which are listed in an NCAAF team's
schedule, an error will be thrown while attempting to parse a score for
the game when none exists. To circumvent this issue, not only should the
points be checked if they are None, they should also be checked if they
are empty.
|
diff --git a/app/search_engines/bento_search/eds_engine.rb b/app/search_engines/bento_search/eds_engine.rb
index <HASH>..<HASH> 100644
--- a/app/search_engines/bento_search/eds_engine.rb
+++ b/app/search_engines/bento_search/eds_engine.rb
@@ -45,6 +45,9 @@ require 'http_client_patch/include_client'
# openurl. http://support.ebsco.com/knowledge_base/detail.php?id=1111 (May
# have to ask EBSCO support for help, it's confusing!).
#
+# TODO: May have to add configuration code to pull the OpenURL link out by
+# it's configured name or label, not assume first one is it.
+#
# As always, you can customize links and other_links with Item Decorators.
#
# == Technical Notes and Difficulties
|
EDS, docs on including OpenURL links
|
diff --git a/explauto/environment/poppy/poppy_env.py b/explauto/environment/poppy/poppy_env.py
index <HASH>..<HASH> 100644
--- a/explauto/environment/poppy/poppy_env.py
+++ b/explauto/environment/poppy/poppy_env.py
@@ -49,9 +49,12 @@ class PoppyEnvironment(Environment):
pos = {m.name: pos for m, pos in zip(self.motors, m_env)}
self.robot.goto_position(pos, self.move_duration, wait=True)
- return self.tracker.get_object_position(self.tracked_obj)
+ # This allows to actually apply a motor command
+ # Without having a tracker
+ if self.tracker is not None:
+ return self.tracker.get_object_position(self.tracked_obj)
def reset(self):
- """ Resets simulation and does nothing when using a real robot. """
+ """ Resets simulation and does nothing when using a real robot. """
if self.robot.simulated:
self.robot.reset_simulation()
|
Add the possibility to create the poppy env without defining a tracker.
|
diff --git a/argcomplete/my_shlex.py b/argcomplete/my_shlex.py
index <HASH>..<HASH> 100644
--- a/argcomplete/my_shlex.py
+++ b/argcomplete/my_shlex.py
@@ -29,8 +29,6 @@ try:
except NameError:
basestring = str
-__all__ = ["shlex", "split"]
-
class shlex:
"A lexical analyzer class for simple shell-like syntaxes."
def __init__(self, instream=None, infile=None, posix=False,
|
Remove __all__ from my_shlex (#<I>)
|
diff --git a/lib/shell_mock/command_stub.rb b/lib/shell_mock/command_stub.rb
index <HASH>..<HASH> 100644
--- a/lib/shell_mock/command_stub.rb
+++ b/lib/shell_mock/command_stub.rb
@@ -3,7 +3,7 @@ require 'shell_mock/stub_registry'
module ShellMock
class CommandStub
- attr_reader :command, :expected_output, :exitstatus, :env, :options, :side_effect, :writer
+ attr_reader :command, :expected_output, :exitstatus, :env, :options, :side_effect
def initialize(command)
@command = command
@@ -63,7 +63,7 @@ module ShellMock
private
- attr_reader :reader
+ attr_reader :reader, :writer
def marshaled_signatures
messages = ""
|
no reason for this to be a public method
|
diff --git a/lib/chef/compliance/runner.rb b/lib/chef/compliance/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/compliance/runner.rb
+++ b/lib/chef/compliance/runner.rb
@@ -17,6 +17,8 @@ class Chef
def_delegators :node, :logger
def enabled?
+ return false if @node.nil?
+
# Did we parse the libraries file from the audit cookbook? This class dates back to when Chef Automate was
# renamed from Chef Visibility in 2017, so should capture all modern versions of the audit cookbook.
audit_cookbook_present = defined?(::Reporter::ChefAutomate)
diff --git a/spec/unit/compliance/runner_spec.rb b/spec/unit/compliance/runner_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/compliance/runner_spec.rb
+++ b/spec/unit/compliance/runner_spec.rb
@@ -12,6 +12,12 @@ describe Chef::Compliance::Runner do
end
describe "#enabled?" do
+ context "when the node is not available" do
+ let(:runner) { described_class.new }
+ it "is false because it needs the node to answer that question" do
+ expect(runner).not_to be_enabled
+ end
+ end
it "is true if the node attributes have audit profiles and the audit cookbook is not present, and the compliance mode attribute is nil" do
node.normal["audit"]["profiles"]["ssh"] = { 'compliance': "base/ssh" }
|
Report not enabled if the node is not available
The #enabled? method needs a node object to answer the question,
and the node object is not always available to it
(for example, run_failed when config is wrong).
|
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/UserAgentFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/UserAgentFilter.java
index <HASH>..<HASH> 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/UserAgentFilter.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/UserAgentFilter.java
@@ -86,17 +86,18 @@ public class UserAgentFilter extends ClientFilter {
* @return the version from resources
*/
private String getVersionFromResources() {
- String version;
+ String version = "unknown";
Properties properties = new Properties();
try {
InputStream inputStream = getClass().getClassLoader().getResourceAsStream(
"META-INF/maven/com.microsoft.windowsazure/microsoft-windowsazure-api/pom.properties");
- properties.load(inputStream);
- version = properties.getProperty("version");
- inputStream.close();
+ if (inputStream != null) {
+ properties.load(inputStream);
+ version = properties.getProperty("version");
+ inputStream.close();
+ }
}
catch (IOException e) {
- version = "";
}
return version;
|
fix an issue on Jason's machine.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.