diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/Framework/DoozR/Logger/Abstract.php b/Framework/DoozR/Logger/Abstract.php
index <HASH>..<HASH> 100644
--- a/Framework/DoozR/Logger/Abstract.php
+++ b/Framework/DoozR/Logger/Abstract.php
@@ -622,7 +622,7 @@ abstract class DoozR_Logger_Abstract extends DoozR_Base_Class
*/
protected function generateFingerprint()
{
- return sha1(implode('', $_SERVER));
+ return sha1(serialize($_SERVER));
}
/**
|
hotfix: Bug in DoozR_Logger_Abstract
|
diff --git a/pmml-model/src/main/java/org/dmg/pmml/adapters/NodeAdapter.java b/pmml-model/src/main/java/org/dmg/pmml/adapters/NodeAdapter.java
index <HASH>..<HASH> 100644
--- a/pmml-model/src/main/java/org/dmg/pmml/adapters/NodeAdapter.java
+++ b/pmml-model/src/main/java/org/dmg/pmml/adapters/NodeAdapter.java
@@ -26,7 +26,7 @@ public class NodeAdapter extends XmlAdapter<ComplexNode, Node> {
return nodeTransformer.toComplexNode(node);
}
- private static final ThreadLocal<NodeTransformer> NODE_TRANSFORMER_PROVIDER = new ThreadLocal<NodeTransformer>(){
+ public static final ThreadLocal<NodeTransformer> NODE_TRANSFORMER_PROVIDER = new ThreadLocal<NodeTransformer>(){
@Override
protected NodeTransformer initialValue(){
|
Relaxed the visibility of ThreadLocal class constants to public
|
diff --git a/spec/influxdb/client_spec.rb b/spec/influxdb/client_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/influxdb/client_spec.rb
+++ b/spec/influxdb/client_spec.rb
@@ -220,7 +220,7 @@ describe InfluxDB::Client do
it "should POST to create a new database user with permissions" do
stub_request(:post, "http://influxdb.test:9999/db/foo/users").with(
:query => {:u => "username", :p => "password"},
- :body => {:name => "useruser", :password => "passpass", :readFrom => "/read*/", writeTo: "/write*/"}
+ :body => {:name => "useruser", :password => "passpass", :readFrom => "/read*/", :writeTo => "/write*/"}
)
@influxdb.create_database_user(
|
Fix spec failures in Ruby <I> due to new hash style
|
diff --git a/lib/request.js b/lib/request.js
index <HASH>..<HASH> 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -17,8 +17,9 @@ module.exports = Request;
* a callback function.
*/
function Request(options, callback) {
- this.options = options || {};
- this.debug = options.debug;
+ this.options = options || {};
+ this.debug = options.debug;
+ this.debugHeaders = options.debugHeaders;
if (this.debug) {
q.longStackSupport = true;
}
@@ -176,6 +177,8 @@ function printHeaders (headers) {
Request.prototype.logRequest = function logRequest(req) {
if (this.debug) {
console.error('--> ' + req.method + ' ' + req.path);
+ }
+ if (this.debugHeaders) {
printHeaders(req._headers);
}
};
@@ -193,6 +196,8 @@ Request.prototype.logResponse = function logResponse(res) {
}
if (this.debug) {
console.error('<-- ' + res.statusCode + ' ' + res.statusMessage);
+ }
+ if (this.debugHeaders) {
printHeaders(res.headers);
}
};
|
split debug and debugHeaders out
|
diff --git a/spice.py b/spice.py
index <HASH>..<HASH> 100644
--- a/spice.py
+++ b/spice.py
@@ -24,7 +24,7 @@ def search(query, medium):
elif medium == MANGA:
return [Manga(entry) for entry in results.manga.findAll('entry')]
else:
- return
+ return None
def search_id(id, medium):
scrape_query = helpers.get_scrape_url(id, medium)
|
Change search invalid argument return to None
Forgot this.
|
diff --git a/test/backend/simple/lambda_test.rb b/test/backend/simple/lambda_test.rb
index <HASH>..<HASH> 100644
--- a/test/backend/simple/lambda_test.rb
+++ b/test/backend/simple/lambda_test.rb
@@ -30,7 +30,7 @@ class I18nSimpleBackendLambdaTest < Test::Unit::TestCase
def test_translate_with_proc_as_default
expected = 'result from lambda'
- assert_equal expected, @backend.translate(:en, :'does not exist', :default => lambda { expected })
+ assert_equal expected, @backend.translate(:en, :'does not exist', :default => lambda { |key, values| expected })
end
private
|
fix lambda_test for ruby <I> (expects to define block params for lambda)
|
diff --git a/pgmpy/models/BayesianModel.py b/pgmpy/models/BayesianModel.py
index <HASH>..<HASH> 100644
--- a/pgmpy/models/BayesianModel.py
+++ b/pgmpy/models/BayesianModel.py
@@ -177,6 +177,10 @@ class BayesianModel(DirectedGraph):
The node whose CPD we want. If node not specified returns all the
CPDs added to the model.
+ Returns
+ -------
+ A list of TabularCPDs.
+
Examples
--------
>>> from pgmpy.models import BayesianModel
@@ -204,7 +208,7 @@ class BayesianModel(DirectedGraph):
Parameters
----------
- *cpds: TabularCPD, TreeCPD, RuleCPD object
+ *cpds: TabularCPD object
A CPD object on any subset of the variables of the model which
is to be associated with the model.
|
updated some docstrings in BayesinaModel
|
diff --git a/examples/multipart.js b/examples/multipart.js
index <HASH>..<HASH> 100644
--- a/examples/multipart.js
+++ b/examples/multipart.js
@@ -30,7 +30,7 @@ router.get('/', (ctx) => {
router.post('/', koaBody,
(ctx) => {
- console.log('fields: ', ctx.request.fields);
+ console.log('fields: ', ctx.request.body);
// => {username: ""} - if empty
console.log('files: ', ctx.request.files);
|
Minor correction to examples/multipart.js (#<I>)
ctx.request.fields no longer exists, removing reference to it
|
diff --git a/src/saml2/response.py b/src/saml2/response.py
index <HASH>..<HASH> 100644
--- a/src/saml2/response.py
+++ b/src/saml2/response.py
@@ -24,6 +24,7 @@ from saml2.samlp import STATUS_TOO_MANY_RESPONSES
from saml2.samlp import STATUS_UNKNOWN_ATTR_PROFILE
from saml2.samlp import STATUS_UNKNOWN_PRINCIPAL
from saml2.samlp import STATUS_UNSUPPORTED_BINDING
+from saml2.samlp import STATUS_RESPONDER
import xmldsig as ds
import xmlenc as xenc
@@ -158,6 +159,8 @@ class StatusUnknownPrincipal(StatusError):
class StatusUnsupportedBinding(StatusError):
pass
+class StatusResponder(StatusError):
+ pass
STATUSCODE2EXCEPTION = {
STATUS_VERSION_MISMATCH: StatusVersionMismatch,
@@ -180,6 +183,7 @@ STATUSCODE2EXCEPTION = {
STATUS_UNKNOWN_ATTR_PROFILE: StatusUnknownAttrProfile,
STATUS_UNKNOWN_PRINCIPAL: StatusUnknownPrincipal,
STATUS_UNSUPPORTED_BINDING: StatusUnsupportedBinding,
+ STATUS_RESPONDER: StatusResponder,
}
# ---------------------------------------------------------------------------
|
make urn:oasis:names:tc:SAML:<I>:status:Responder known in response.py
|
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Database/Eloquent/Model.php
+++ b/src/Illuminate/Database/Eloquent/Model.php
@@ -269,6 +269,10 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
$model->exists = $exists;
+ $model->setConnection(
+ $this->getConnectionName()
+ );
+
return $model;
}
|
Use same connection on creating new instance (#<I>)
|
diff --git a/examples/audio-search.php b/examples/audio-search.php
index <HASH>..<HASH> 100644
--- a/examples/audio-search.php
+++ b/examples/audio-search.php
@@ -5,11 +5,18 @@ require '../vendor/autoload.php';
$audio = new Op3nvoice\Audio($apikey);
-$items = $audio->search('does');
+$result = $audio->search('close');
-foreach($items as $item) {
+$results = $result['item_results'];
+$items = $result['_links']['item'];
+foreach($items as $index => $item) {
$bundle = $audio->load($item['href']);
echo $bundle['_links']['self']['href'] . "\n";
echo $bundle['name'] . "\n";
+
+ $search_hits = $results[$index]['term_results'][0]['matches'][0]['hits'];
+ foreach($search_hits as $search_hit) {
+ echo $search_hit['start'] . ' -- ' . $search_hit['end'] . "\n";
+ }
}
\ No newline at end of file
|
wired the search results to work more simply
|
diff --git a/src/Roave/DeveloperTools/Mvc/Controller/ListInspectionsController.php b/src/Roave/DeveloperTools/Mvc/Controller/ListInspectionsController.php
index <HASH>..<HASH> 100644
--- a/src/Roave/DeveloperTools/Mvc/Controller/ListInspectionsController.php
+++ b/src/Roave/DeveloperTools/Mvc/Controller/ListInspectionsController.php
@@ -63,11 +63,11 @@ class ListInspectionsController extends AbstractController
'inspections' => $inspections,
'inspectionModels' => array_filter(array_map(
function (InspectionInterface $inspection) {
- if ($this->inspectionRenderer->canRender($inspection)) {
- return $this->inspectionRenderer->render($inspection);
+ if (! $this->inspectionRenderer->canRender($inspection)) {
+ return null;
}
- return null;
+ return $this->inspectionRenderer->render($inspection);
},
$inspections
)),
|
Inverting conditional for clearness
|
diff --git a/app/models/shipit/task.rb b/app/models/shipit/task.rb
index <HASH>..<HASH> 100644
--- a/app/models/shipit/task.rb
+++ b/app/models/shipit/task.rb
@@ -77,6 +77,10 @@ module Shipit
task.async_refresh_deployed_revision
end
+ after_transition any => %i(aborted success failed error timedout) do |task|
+ task.schedule_rollup_chunks
+ end
+
after_transition any => :flapping do |task|
task.update!(confirmations: 0)
end
|
Roll up the task output right after the task has finished
|
diff --git a/js/huobipro.js b/js/huobipro.js
index <HASH>..<HASH> 100644
--- a/js/huobipro.js
+++ b/js/huobipro.js
@@ -83,7 +83,6 @@ module.exports = class huobipro extends Exchange {
},
'private': {
'get': [
- 'points/actions',
'account/accounts', // 查询当前用户的所有账户(即account-id)
'account/accounts/{id}/balance', // 查询指定账户的余额
'order/orders/{id}', // 查询某个订单详情
@@ -95,6 +94,8 @@ module.exports = class huobipro extends Exchange {
'query/deposit-withdraw',
'margin/loan-orders', // 借贷订单
'margin/accounts/balance', // 借贷账户详情
+ 'points/actions',
+ 'points/orders',
],
'post': [
'order/orders/place', // 创建并执行一个新订单 (一步下单， 推荐使用)
|
added points/orders endpoint to huobipro
|
diff --git a/playback/templates/nova_compute_conf.py b/playback/templates/nova_compute_conf.py
index <HASH>..<HASH> 100644
--- a/playback/templates/nova_compute_conf.py
+++ b/playback/templates/nova_compute_conf.py
@@ -14,4 +14,5 @@ rbd_secret_uuid = {{ rbd_secret_uuid }}
disk_cachemodes= "network=writeback"
block_migration_flag = "VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_NON_SHARED_INC"
live_migration_flag = "VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST,VIR_MIGRATE_TUNNELLED"
+live_migration_uri = qemu+tcp://%s/system
"""
|
Change live migration to use tcp not ssh
|
diff --git a/tests/test_requests.py b/tests/test_requests.py
index <HASH>..<HASH> 100644
--- a/tests/test_requests.py
+++ b/tests/test_requests.py
@@ -385,13 +385,13 @@ class TestRequestGenerator(unittest.TestCase):
kwargs = {"limit": "100", "asn": "3333"}
r = RequestGenerator(**kwargs)
self.assertEqual(
- decostruct_url_params(r.build_url()), {"limit=100", "asn=3333"}
+ decostruct_url_params(r.build_url()), set(["limit=100", "asn=3333"])
)
kwargs = {"limit": "100", "asn": "3333", "tags": "NAT,system-ipv4-works"}
r = RequestGenerator(**kwargs)
self.assertEqual(
decostruct_url_params(r.build_url()),
- {"limit=100", "tags=NAT,system-ipv4-works", "asn=3333"}
+ set(["limit=100", "tags=NAT,system-ipv4-works", "asn=3333"])
)
kwargs = {"asn": "3333"}
r = RequestGenerator(**kwargs)
|
Python <I> is ugly and needs to die
|
diff --git a/lib/enumerize/attribute.rb b/lib/enumerize/attribute.rb
index <HASH>..<HASH> 100644
--- a/lib/enumerize/attribute.rb
+++ b/lib/enumerize/attribute.rb
@@ -19,9 +19,9 @@ module Enumerize
end
# Define methods to get each value
- @values.each do |name, value|
+ @values.each do |v|
metaclass = class << self; self; end
- metaclass.send(:define_method, name) { value.value }
+ metaclass.send(:define_method, v.to_s) { v.value }
end
end
|
@values is an array not a hash
|
diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
+++ b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -1216,6 +1216,8 @@ class UnitOfWork
$this->scheduledUpdates[$oid] = $document;
} elseif (isset($this->documentChangesets[$oid])) {
+ // make sure we don't keep an old changeset if an event changed
+ // the document and no field changeset remains.
$this->documentChangesets[$oid]['fields'] = array();
}
}
|
adding a small comment about the recalculating fix from #<I>
|
diff --git a/pymongo/bson.py b/pymongo/bson.py
index <HASH>..<HASH> 100644
--- a/pymongo/bson.py
+++ b/pymongo/bson.py
@@ -369,8 +369,8 @@ def _dict_to_bson(dict):
length = len(elements) + 5
return struct.pack("<i", length) + elements + "\x00"
-if _use_c:
- _dict_to_bson = _cbson._dict_to_bson
+# if _use_c:
+# _dict_to_bson = _cbson._dict_to_bson
def is_valid(bson):
"""Validate that the given string represents valid BSON data.
|
oops, not ready to commit this yet
|
diff --git a/lib/Cake/tests/Case/Network/CakeRequestTest.php b/lib/Cake/tests/Case/Network/CakeRequestTest.php
index <HASH>..<HASH> 100644
--- a/lib/Cake/tests/Case/Network/CakeRequestTest.php
+++ b/lib/Cake/tests/Case/Network/CakeRequestTest.php
@@ -1039,6 +1039,7 @@ class CakeRequestTestCase extends CakeTestCase {
'REQUEST_URI' => '/index.php?/posts/add',
'PHP_SELF' => '',
'URL' => '/index.php?/posts/add',
+ 'DOCUMENT_ROOT' => 'C:\\Inetpub\\wwwroot',
'argv' => array('/posts/add'),
'argc' => 1
),
@@ -1317,6 +1318,7 @@ class CakeRequestTestCase extends CakeTestCase {
* @return void
*/
public function testEnvironmentDetection($name, $env, $expected) {
+ $_GET = array();
$this->__loadEnvironment($env);
$request = new CakeRequest();
|
Fixing a couple of tests in CakeRequest
|
diff --git a/src/pyws/errors.py b/src/pyws/errors.py
index <HASH>..<HASH> 100644
--- a/src/pyws/errors.py
+++ b/src/pyws/errors.py
@@ -10,7 +10,7 @@ class Error(DefaultStrImplemntationMixin, Exception):
def __unicode__(self):
if self.__doc__:
- return unicode(self.__doc__ % self.args)
+ return unicode(self.__doc__.strip() % self.args)
if self.args:
return self.args[0]
return 'unknown error'
|
added .strip to error messages
|
diff --git a/tcconfig/parser/_filter.py b/tcconfig/parser/_filter.py
index <HASH>..<HASH> 100644
--- a/tcconfig/parser/_filter.py
+++ b/tcconfig/parser/_filter.py
@@ -219,7 +219,7 @@ class TcFilterParser(AbstractParser):
def __parse_priority(self, line):
parsed_list = self.__FILTER_PRIORITY_PATTERN.parseString(line)
- self.__priority = parsed_list[-1]
+ self.__priority = int(parsed_list[-1])
logger.debug("succeed to parse priority: priority={}, line={}".format(
self.__priority, line))
|
Modify filter priority value type from str to int
|
diff --git a/tools/specification-importer/specification-docs-generator.js b/tools/specification-importer/specification-docs-generator.js
index <HASH>..<HASH> 100644
--- a/tools/specification-importer/specification-docs-generator.js
+++ b/tools/specification-importer/specification-docs-generator.js
@@ -54,7 +54,19 @@ var generateVBusSpecificationDocs = function(spec) {
'|:-:|:-:|:--|',
]);
- _.forEach(info.deviceTemplates, function(device) {
+ var deviceTemplateKeys = _.keys(info.deviceTemplates).sort(function(lKey, rKey) {
+ var l = info.deviceTemplates [lKey];
+ var r = info.deviceTemplates [rKey];
+
+ var result = (l.selfAddress & l.selfMask) - (r.selfAddress & l.selfMask);
+ if (result === 0) {
+ result = l.selfMask - r.selfMask;
+ }
+ return result;
+ });
+
+ _.forEach(deviceTemplateKeys, function(deviceKey) {
+ var device = info.deviceTemplates [deviceKey];
lines.push(sprintf('| 0x%04X | 0x%04X | %s |', device.selfAddress, device.selfMask, escapeString(device.name)));
});
|
Output devices sorted by address.
|
diff --git a/lib/fog/core/services_mixin.rb b/lib/fog/core/services_mixin.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/core/services_mixin.rb
+++ b/lib/fog/core/services_mixin.rb
@@ -15,7 +15,7 @@ module Fog
spc = service_provider_constant(service_name, provider_name)
spc.new(attributes)
rescue LoadError, NameError # Only rescue errors in finding the libraries, allow connection errors through to the caller
- raise NotFound, "#{provider} has no #{service_name.downcase} service"
+ raise Fog::Service::NotFound, "#{provider} has no #{service_name.downcase} service"
end
def providers
|
fix uninitialized constant error for NotFound
|
diff --git a/spyder/plugins/editor/widgets/editor.py b/spyder/plugins/editor/widgets/editor.py
index <HASH>..<HASH> 100644
--- a/spyder/plugins/editor/widgets/editor.py
+++ b/spyder/plugins/editor/widgets/editor.py
@@ -2651,7 +2651,8 @@ class EditorStack(QWidget):
# To update the outline explorer.
editor.oe_proxy = OutlineExplorerProxyEditor(editor, editor.filename)
- self.outlineexplorer.register_editor(editor.oe_proxy)
+ if self.outlineexplorer is not None:
+ self.outlineexplorer.register_editor(editor.oe_proxy)
# Needs to reset the highlighting on startup in case the PygmentsSH
# is in use
|
Editor: Fix errors when Outline is not present
|
diff --git a/i3ipc/i3ipc.py b/i3ipc/i3ipc.py
index <HASH>..<HASH> 100644
--- a/i3ipc/i3ipc.py
+++ b/i3ipc/i3ipc.py
@@ -353,7 +353,7 @@ class Connection(object):
_struct_header_size = struct.calcsize(_struct_header)
def __init__(self, socket_path=None, auto_reconnect=False):
- if not socket_path:
+ if not socket_path and os.environ.get("_I3IPC_TEST") is None:
socket_path = os.environ.get("I3SOCK")
if not socket_path:
diff --git a/run-tests.py b/run-tests.py
index <HASH>..<HASH> 100755
--- a/run-tests.py
+++ b/run-tests.py
@@ -109,6 +109,7 @@ def run_pytest(display):
env = os.environ.copy()
env['DISPLAY'] = ':%d' % display
env['PYTHONPATH'] = './i3ipc'
+ env['_I3IPC_TEST'] = '1'
subprocess.run([PYTEST], env=env)
|
Ignore I3SOCK during tests
When we use the new I3SOCK environment variable set by i3, it will
ignore the current DISPLAY which is required to run tests on the Xvfb
server when running in another display.
|
diff --git a/classes/Gems/User/Form/OrganizationFormAbstract.php b/classes/Gems/User/Form/OrganizationFormAbstract.php
index <HASH>..<HASH> 100644
--- a/classes/Gems/User/Form/OrganizationFormAbstract.php
+++ b/classes/Gems/User/Form/OrganizationFormAbstract.php
@@ -164,6 +164,7 @@ abstract class Gems_User_Form_OrganizationFormAbstract extends Gems_Form_AutoLoa
} elseif (! $element instanceof Zend_Form_Element_Select) {
$element = new Zend_Form_Element_Select($this->organizationFieldName);
$element->setLabel($this->translate->_('Organization'));
+ $element->setRegisterInArrayValidator(true);
$element->setRequired(true);
$element->setMultiOptions($orgs);
@@ -171,6 +172,7 @@ abstract class Gems_User_Form_OrganizationFormAbstract extends Gems_Form_AutoLoa
$element->setAttrib('size', max(count($orgs) + 1, $this->organizationMaxLines));
}
$this->addElement($element);
+
$element->setValue($orgId);
}
|
When the organization id is empty or non-existent
|
diff --git a/config/routes.rb b/config/routes.rb
index <HASH>..<HASH> 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,10 +5,12 @@ Rails.application.routes.draw do
constraints(:id => /[^\/]+/) do
resources :discovered
match 'discovered/:id/refresh_facts' => 'discovered#refresh_facts', :as => 'refresh_facts'
- match 'architecture_selected_discovered' => 'hosts#architecture_selected'
- match 'os_selected_discovered' => 'hosts#os_selected'
- match 'medium_selected_discovered' => 'hosts#medium_selected'
end
end
+ # Needed to make the hosts/edit form render
+ match 'architecture_selected_discovered' => 'hosts#architecture_selected'
+ match 'os_selected_discovered' => 'hosts#os_selected'
+ match 'medium_selected_discovered' => 'hosts#medium_selected'
+
end
|
Fix edit routes, they need to be outside the module scope
|
diff --git a/parler_rest/serializers.py b/parler_rest/serializers.py
index <HASH>..<HASH> 100644
--- a/parler_rest/serializers.py
+++ b/parler_rest/serializers.py
@@ -48,4 +48,7 @@ class TranslatableModelSerializer(serializers.ModelSerializer):
translation = instance._get_translated_model(lang_code, auto_create=True, meta=meta)
for field, value in model_fields.items():
setattr(translation, field, value)
- translation.save()
+
+ # Go through the same hooks as the regular model,
+ # instead of calling translation.save() directly.
+ instance.save_translations()
|
Make sure save_translations() is called when saving via REST
|
diff --git a/core/src/main/java/hudson/tasks/UserAvatarResolver.java b/core/src/main/java/hudson/tasks/UserAvatarResolver.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/tasks/UserAvatarResolver.java
+++ b/core/src/main/java/hudson/tasks/UserAvatarResolver.java
@@ -49,7 +49,7 @@ import hudson.model.User;
* </pre>
*
* @author Erik Ramfelt
- * @since 1.433
+ * @since 1.434
*/
public abstract class UserAvatarResolver implements ExtensionPoint {
|
Updated the since doc for UserAvatarResolver
|
diff --git a/NetLicensingClient/netlicensing.php b/NetLicensingClient/netlicensing.php
index <HASH>..<HASH> 100644
--- a/NetLicensingClient/netlicensing.php
+++ b/NetLicensingClient/netlicensing.php
@@ -43,7 +43,7 @@ class NetLicensing
}
$params = array(
'productNumber' => $productNumber,
- 'name' => $licenseeName,
+ 'licenseeName' => $licenseeName,
);
$url = self::NLIC_BASE_URL . '/licensee/' . $licenseeNumber . '/validate';
|
change licenseeName attribute according to the API <I>
|
diff --git a/src/Exscript/util/template.py b/src/Exscript/util/template.py
index <HASH>..<HASH> 100644
--- a/src/Exscript/util/template.py
+++ b/src/Exscript/util/template.py
@@ -20,7 +20,7 @@ from Exscript.interpreter import Parser
def _compile(conn, filename, template, parser_kwargs, **kwargs):
if conn:
- kwargs.update(conn.get_host().vars)
+ kwargs.update(conn.get_host().get_all())
# Init the parser.
parser = Parser(**parser_kwargs)
|
fix: Exscript.util.template.run() on hosts that have no variables defined.
|
diff --git a/ubcpi/ubcpi.py b/ubcpi/ubcpi.py
index <HASH>..<HASH> 100644
--- a/ubcpi/ubcpi.py
+++ b/ubcpi/ubcpi.py
@@ -127,7 +127,7 @@ class PeerInstructionXBlock(XBlock, MissingDataFetcherMixin):
question_text = Dict(
default={'text': 'What is your question?', 'image_url': '', 'image_position': 'below', 'show_image_fields': 0}, scope=Scope.content,
- help="Some help text here change this"
+ help="The question the students see. This question appears above the possible answers which you set below. You can use text, an image or a combination of both. If you wish to add an image to your question, press the 'Add Image' button."
)
options = List(
|
CHANGE the default help for the question_text Dict so now we can use this to output the help rather some some separate markup
|
diff --git a/src/Plugin/plugin.helper.functions.php b/src/Plugin/plugin.helper.functions.php
index <HASH>..<HASH> 100644
--- a/src/Plugin/plugin.helper.functions.php
+++ b/src/Plugin/plugin.helper.functions.php
@@ -21,7 +21,15 @@ const PLUGIN_FQCN_TEMPLATE = 'Moka\\Plugin\\%s\\%sPlugin';
*/
function loadPlugin(string $pluginName): MockingStrategyInterface
{
- $pluginFQCN = generateFQCN($pluginName);
+ $generateFQCN = function (string $pluginName): string {
+ return sprintf(
+ PLUGIN_FQCN_TEMPLATE,
+ ucfirst($pluginName),
+ ucfirst($pluginName)
+ );
+ };
+
+ $pluginFQCN = $generateFQCN($pluginName);
if (
!class_exists($pluginFQCN) ||
@@ -37,18 +45,4 @@ function loadPlugin(string $pluginName): MockingStrategyInterface
/** @var PluginInterface $pluginFQCN */
return $pluginFQCN::getStrategy();
-}
-
-
-/**
- * @param string $pluginName
- * @return string
- */
-function generateFQCN(string $pluginName): string
-{
- return sprintf(
- PLUGIN_FQCN_TEMPLATE,
- ucfirst($pluginName),
- ucfirst($pluginName)
- );
-}
+}
\ No newline at end of file
|
Encapsulate in a private context the function 'generateFQCn'
|
diff --git a/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationBuilder.java b/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationBuilder.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationBuilder.java
+++ b/core/src/main/java/org/infinispan/configuration/global/GlobalConfigurationBuilder.java
@@ -33,7 +33,9 @@ public class GlobalConfigurationBuilder implements GlobalConfigurationChildBuild
public GlobalConfigurationBuilder() {
// In OSGi contexts the TCCL should not be used. Use the infinispan-core bundle as default instead.
- ClassLoader defaultCL = Util.isOSGiContext() ? GlobalConfigurationBuilder.class.getClassLoader() : Thread.currentThread().getContextClassLoader();
+ ClassLoader defaultCL = null;
+ if (!Util.isOSGiContext()) defaultCL = Thread.currentThread().getContextClassLoader();
+ if (defaultCL == null) defaultCL = GlobalConfigurationBuilder.class.getClassLoader();
this.cl = new WeakReference<ClassLoader>(defaultCL);
this.transport = new TransportConfigurationBuilder(this);
this.globalJmxStatistics = new GlobalJmxStatisticsConfigurationBuilder(this);
|
ISPN-<I> Resolve classes properly when Thread context classloader is null
If TCCL is null, fallback to ISPN classes classloader
|
diff --git a/ml-agents/mlagents/trainers/tests/test_simple_rl.py b/ml-agents/mlagents/trainers/tests/test_simple_rl.py
index <HASH>..<HASH> 100644
--- a/ml-agents/mlagents/trainers/tests/test_simple_rl.py
+++ b/ml-agents/mlagents/trainers/tests/test_simple_rl.py
@@ -365,12 +365,12 @@ def test_simple_asymm_ghost(use_discrete):
[BRAIN_NAME + "?team=0", brain_name_opp + "?team=1"], use_discrete=use_discrete
)
override_vals = {
- "max_steps": 2000,
+ "max_steps": 4000,
"self_play": {
"play_against_latest_model_ratio": 1.0,
- "save_steps": 5000,
- "swap_steps": 5000,
- "team_change": 2000,
+ "save_steps": 10000,
+ "swap_steps": 10000,
+ "team_change": 4000,
},
}
config = generate_config(PPO_CONFIG, override_vals)
|
Increasing steps on asymmetric ghost test (#<I>)
|
diff --git a/TYPO3.Flow/Classes/Http/Response.php b/TYPO3.Flow/Classes/Http/Response.php
index <HASH>..<HASH> 100644
--- a/TYPO3.Flow/Classes/Http/Response.php
+++ b/TYPO3.Flow/Classes/Http/Response.php
@@ -358,8 +358,8 @@ class Response implements ResponseInterface{
/**
* Cast the response to a string: return the content part of this response
*
- * @return string The same as getContent()
- * @api
+ * @return string The same as getContent()
+ * @api
*/
public function __toString() {
return $this->getContent();
|
[TASK] Annotation cleanup for http response __toString method
Change-Id: Ice5a<I>fad<I>a4a<I>be<I>a9d7d<I>d3e0f<I>c
Related: #<I>
Releases: <I>, <I>
Original-Commit-Hash: a2e8c<I>edcc<I>cdf<I>d<I>fc<I>e5ca2daf6
|
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index <HASH>..<HASH> 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -1128,10 +1128,15 @@ class grade_report_grader extends grade_report {
global $USER;
$iconshtml = '';
- if ($USER->gradeediting[$this->courseid]) {
+ if ($USER->gradeediting[$this->courseid]) {
+
+ $colspan='';
+ if ($this->get_pref('showuseridnumber')) {
+ $colspan = 'colspan="2" ';
+ }
$iconshtml = '<tr class="r'.$this->rowcount++.'">'
- . '<th class="header c0 range" scope="row">'.$this->get_lang_string('controls','grades').'</th>';
+ . '<th class="header c0 range" scope="row" '.$colspan.'>'.$this->get_lang_string('controls','grades').'</th>';
$columncount = 1;
foreach ($this->gtree->items as $itemid=>$unused) {
|
MDL-<I> Grader report: Showing idnumber column shifts controls into wrong columns; merged from MOODLE_<I>_STABLE
|
diff --git a/rollbar/__init__.py b/rollbar/__init__.py
index <HASH>..<HASH> 100644
--- a/rollbar/__init__.py
+++ b/rollbar/__init__.py
@@ -156,7 +156,7 @@ SETTINGS = {
},
'allow_logging_basic_config': True, # set to False to avoid a call to logging.basicConfig()
'locals': {
- 'enabled': False,
+ 'enabled': True,
'sizes': DEFAULT_LOCALS_SIZES
}
}
|
enable locals by default for <I> @brianr
|
diff --git a/generator/classes/propel/phing/AbstractPropelDataModelTask.php b/generator/classes/propel/phing/AbstractPropelDataModelTask.php
index <HASH>..<HASH> 100644
--- a/generator/classes/propel/phing/AbstractPropelDataModelTask.php
+++ b/generator/classes/propel/phing/AbstractPropelDataModelTask.php
@@ -536,7 +536,8 @@ abstract class AbstractPropelDataModelTask extends Task {
**/
protected function includeExternalSchemas(DomDocument $dom, $srcDir) {
$databaseNode = $dom->getElementsByTagName("database")->item(0);
- foreach ($dom->getElementsByTagName("external-schema") as $externalSchema) {
+ $externalSchemaNodes = $dom->getElementsByTagName("external-schema");
+ while ($externalSchema = $externalSchemaNodes->item(0)) {
$include = $externalSchema->getAttribute("filename");
$externalSchema->parentNode->removeChild($externalSchema);
$externalSchemaFile = new PhingFile($srcDir, $include);
|
Iterating over DOM nodes gets messed up when you remove nodes that are in the collection. This lead to skipping the next external-schema reference and thus missing definitions in schema-transformed.xml.
|
diff --git a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
index <HASH>..<HASH> 100644
--- a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
@@ -179,6 +179,17 @@ public class SpringApplicationBuilderTests {
}
@Test
+ public void parentFirstWithDifferentProfile() throws Exception {
+ SpringApplicationBuilder application = new SpringApplicationBuilder(
+ ExampleConfig.class).profiles("node").properties("transport=redis")
+ .child(ChildConfig.class).profiles("admin").web(false);
+ this.context = application.run();
+ assertThat(this.context.getEnvironment().acceptsProfiles("node"), is(true));
+ assertThat(this.context.getParent().getEnvironment().acceptsProfiles("admin"),
+ is(false));
+ }
+
+ @Test
public void parentContextIdentical() throws Exception {
SpringApplicationBuilder application = new SpringApplicationBuilder(
ExampleConfig.class);
|
Add test for gh-<I>
|
diff --git a/src/ansiblelint/file_utils.py b/src/ansiblelint/file_utils.py
index <HASH>..<HASH> 100644
--- a/src/ansiblelint/file_utils.py
+++ b/src/ansiblelint/file_utils.py
@@ -209,7 +209,13 @@ class Lintable:
def _populate_content_cache_from_disk(self) -> None:
# Can raise UnicodeDecodeError
- self._content = self.path.resolve().read_text(encoding="utf-8")
+ try:
+ self._content = self.path.resolve().read_text(encoding="utf-8")
+ except FileNotFoundError as ex:
+ if vars(options).get("progressive"):
+ self._content = ""
+ else:
+ raise ex
if self._original_content is None:
self._original_content = self._content
|
Handle FileNotFoundError caused by processing new file in progressive mode (#<I>)
|
diff --git a/Routes.php b/Routes.php
index <HASH>..<HASH> 100644
--- a/Routes.php
+++ b/Routes.php
@@ -10,6 +10,7 @@
namespace Brain;
+use Brain\Cortex\Group\GroupCollection;
use Brain\Cortex\Group\GroupCollectionInterface;
use Brain\Cortex\Route\PriorityRouteCollection;
use Brain\Cortex\Route\RouteCollectionInterface;
|
Add missing use statement in Brain\Routes
|
diff --git a/cmds/tfa.js b/cmds/tfa.js
index <HASH>..<HASH> 100644
--- a/cmds/tfa.js
+++ b/cmds/tfa.js
@@ -58,9 +58,8 @@ async function enable (argv) {
}
let challenge = await profile.set(info, argv.registry, {token, otp: argv.otp})
if (challenge.tfa === null) {
- let result = await profile.set({tfa: {password, mode: 'disable'}}, argv.registry, {token, otp: argv.otp})
- console.log(result)
- challenge = await profile.set(info, argv.registry, {token, otp: argv.otp})
+ console.log('Two factor auth mode changed to: ' + argv.mode)
+ return
}
if (typeof challenge.tfa !== 'string' || !/^otpauth:[/][/]/.test(challenge.tfa)) {
console.error('Unknown error enabling two-factor authentication. Expected otpauth URL, got:', challenge.tfa)
|
A null response from a tfa set means it changed modes, no error
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ from setuptools import setup, find_packages
from numpy.distutils.core import setup, Extension
from os import path
import io
-import os
+import os, subprocess
## in development set version to none and ...
|
Update setup.py
Good grief. Will this never end ?
|
diff --git a/discovery/utils.go b/discovery/utils.go
index <HASH>..<HASH> 100644
--- a/discovery/utils.go
+++ b/discovery/utils.go
@@ -10,7 +10,7 @@ import (
"github.com/roasbeef/btcd/btcec"
)
-// newProofKey constructs new announcement signature message key.
+// newProofKey constructs a new announcement signature message key.
func newProofKey(chanID uint64, isRemote bool) waitingProofKey {
return waitingProofKey{
chanID: chanID,
@@ -18,9 +18,9 @@ func newProofKey(chanID uint64, isRemote bool) waitingProofKey {
}
}
-// ToBytes represents the key in the byte format.
+// ToBytes returns a serialized representation of the key.
func (k waitingProofKey) ToBytes() []byte {
- var key [10]byte
+ var key [9]byte
var b uint8
if k.isRemote {
@@ -29,8 +29,8 @@ func (k waitingProofKey) ToBytes() []byte {
b = 1
}
- binary.BigEndian.PutUint64(key[:], k.chanID)
- key[9] = b
+ binary.BigEndian.PutUint64(key[:8], k.chanID)
+ key[8] = b
return key[:]
}
|
discovery: utilize exactly 9 bytes for serialized waitingProofKey
|
diff --git a/src/Cache/ApcCache.php b/src/Cache/ApcCache.php
index <HASH>..<HASH> 100644
--- a/src/Cache/ApcCache.php
+++ b/src/Cache/ApcCache.php
@@ -44,7 +44,8 @@ class ApcCache implements CacheInterface
{
$cache = apc_cache_info('user');
foreach($cache['cache_list'] as $entry) {
- if(strpos($entry['info'], 'minime-annotations:') === 0) {
+ if(isset($entry['info'])
+ && strpos($entry['info'], 'minime-annotations:') === 0) {
apc_delete($entry['info']);
}
}
|
patch to keep ApcCache handler compatible with HHVM #<I>
|
diff --git a/cosmic_ray/version.py b/cosmic_ray/version.py
index <HASH>..<HASH> 100644
--- a/cosmic_ray/version.py
+++ b/cosmic_ray/version.py
@@ -1,3 +1,3 @@
"""Cosmic Ray version info."""
-__version__ = '2.0.0a0'
+__version__ = '2.0.1'
|
bumped version to <I>
|
diff --git a/lib/xmldb/classes/generators/XMLDBGenerator.class.php b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
index <HASH>..<HASH> 100644
--- a/lib/xmldb/classes/generators/XMLDBGenerator.class.php
+++ b/lib/xmldb/classes/generators/XMLDBGenerator.class.php
@@ -668,7 +668,7 @@ class XMLDBgenerator {
$rename = str_replace('TABLENAME', $this->getTableName($xmldb_table), $this->rename_column_sql);
$rename = str_replace('OLDFIELDNAME', $this->getEncQuoted($xmldb_field->getName()), $rename);
- $rename = str_replace('NEWFIELDNAME', $this->getEncQuoted($newname)), $rename);
+ $rename = str_replace('NEWFIELDNAME', $this->getEncQuoted($newname), $rename);
$results[] = $rename;
|
getting tired of restore my test Oracle DB. Typo!
|
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index <HASH>..<HASH> 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -785,7 +785,7 @@ $string['forgotteninvalidurl'] = 'Invalid password reset URL';
$string['format'] = 'Format';
$string['format_help'] = 'The course format determines the layout of the course page.
-* SCORM format - For displaying a SCORM package in the first section of the course page (as an alternative to using the SCORM/AICC module)
+* Single activity format - For displaying a single activity or resource (such as a Quiz or SCORM package) on the course page
* Social format - A forum is displayed on the course page
* Topics format - The course page is organised into topic sections
* Weekly format - The course page is organised into weekly sections, with the first week starting on the course start date';
|
MDL-<I> course: Changed help string for course format selection
|
diff --git a/src/utilities/findBreakingChanges.js b/src/utilities/findBreakingChanges.js
index <HASH>..<HASH> 100644
--- a/src/utilities/findBreakingChanges.js
+++ b/src/utilities/findBreakingChanges.js
@@ -8,6 +8,7 @@
*/
import find from '../polyfills/find';
+import inspect from '../jsutils/inspect';
import {
type GraphQLNamedType,
type GraphQLFieldMap,
@@ -292,7 +293,10 @@ function typeKindName(type: GraphQLNamedType): string {
if (isInputObjectType(type)) {
return 'an Input type';
}
- throw new TypeError('Unknown type ' + type.constructor.name);
+
+ // Not reachable. All possible named types have been considered.
+ /* istanbul ignore next */
+ throw new TypeError(`Unexpected type: ${inspect((type: empty))}.`);
}
function findFieldsThatChangedTypeOnObjectOrInterfaceTypes(
|
findBreakingChanges: Correctly document not reachable statement (#<I>)
|
diff --git a/lib/bibliothecary/parsers/go.rb b/lib/bibliothecary/parsers/go.rb
index <HASH>..<HASH> 100644
--- a/lib/bibliothecary/parsers/go.rb
+++ b/lib/bibliothecary/parsers/go.rb
@@ -146,7 +146,7 @@ module Bibliothecary
def self.parse_go_resolved(file_contents)
JSON.parse(file_contents)
- .select { |dep| dep["Main"] == "false" }
+ .select { |dep| dep["Main"] != "true" }
.map { |dep| { name: dep["Path"], requirement: dep["Version"], type: 'runtime' } }
end
|
change to check for not true instead of == to false
|
diff --git a/app-web/WebSocketOverCOMET.php b/app-web/WebSocketOverCOMET.php
index <HASH>..<HASH> 100644
--- a/app-web/WebSocketOverCOMET.php
+++ b/app-web/WebSocketOverCOMET.php
@@ -246,7 +246,7 @@ class WebSocketOverCOMET_Request extends Request
$this->atime = time();
$this->finish(0,TRUE);
}
- if ($this->atime < time()-10)
+ if ($this->atime < time()-30)
{
if (isset($this->downstream))
{
@@ -288,9 +288,9 @@ class WebSocketOverCOMET_Request extends Request
$a[] = $this->idAppQueue;
unset($a);
$this->out("\n");
- $this->sleep(1);
+ $this->sleep(15);
}
- $this->sleep(10);
+ return Request::DONE;
}
}
/* @method onAbort
|
Minor improvements in app-web/WebSocketOverCOMET.php
|
diff --git a/cmd/torrent/download.go b/cmd/torrent/download.go
index <HASH>..<HASH> 100644
--- a/cmd/torrent/download.go
+++ b/cmd/torrent/download.go
@@ -234,10 +234,11 @@ func downloadErr(flags downloadFlags) error {
clientConfig.SetListenAddr(flags.Addr)
}
if flags.UploadRate != nil {
+ // TODO: I think the upload rate limit could be much lower.
clientConfig.UploadRateLimiter = rate.NewLimiter(rate.Limit(*flags.UploadRate), 256<<10)
}
if flags.DownloadRate != nil {
- clientConfig.DownloadRateLimiter = rate.NewLimiter(rate.Limit(*flags.DownloadRate), 1<<20)
+ clientConfig.DownloadRateLimiter = rate.NewLimiter(rate.Limit(*flags.DownloadRate), 1<<16)
}
if flags.Quiet {
clientConfig.Logger = log.Discard
|
cmd/torrent: Lower burst when there's a download rate limit
|
diff --git a/src/Utils/Logger.php b/src/Utils/Logger.php
index <HASH>..<HASH> 100644
--- a/src/Utils/Logger.php
+++ b/src/Utils/Logger.php
@@ -24,7 +24,7 @@ class Logger {
}
protected function init($root) {
- $loggerFile = $root.'console/log/' . date('Y-m-d') . '.log';
+ $loggerFile = $root.'/console/log/' . date('Y-m-d') . '.log';
if (!is_file($loggerFile)) {
try {
$directoryName = dirname($loggerFile);
|
Fix logger path (#<I>)
* [console] Read alias as array.
* [console] Remove no longer required instruction.
* [logger] Fix log file path.
|
diff --git a/luigi/file.py b/luigi/file.py
index <HASH>..<HASH> 100644
--- a/luigi/file.py
+++ b/luigi/file.py
@@ -8,6 +8,12 @@ class File(object):
return os.path.exists(self.__path)
def open(self, mode = 'r'):
+ if mode == 'w' or mode == 'a':
+ # Create folder if it does not exist
+ normpath = os.path.normpath(self.__path)
+ parentfolder = os.path.dirname(normpath)
+ if not os.path.exists(parentfolder):
+ os.makedirs(parentfolder)
return open(self.__path, mode)
def remove(self):
|
LocalTarget and File create folder while creating a new file
Change-Id: Ie8e2ba3bf<I>ed<I>c<I>b<I>e<I>
|
diff --git a/core/src/main/java/org/bitcoinj/utils/Threading.java b/core/src/main/java/org/bitcoinj/utils/Threading.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/bitcoinj/utils/Threading.java
+++ b/core/src/main/java/org/bitcoinj/utils/Threading.java
@@ -20,6 +20,7 @@ import com.google.common.util.concurrent.CycleDetectingLockFactory;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.Uninterruptibles;
+import org.bitcoinj.core.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -152,7 +153,10 @@ public class Threading {
public static CycleDetectingLockFactory factory;
public static ReentrantLock lock(String name) {
- return factory.newReentrantLock(name);
+ if (Utils.isAndroidRuntime())
+ return new ReentrantLock(true);
+ else
+ return factory.newReentrantLock(name);
}
public static void warnOnLockCycles() {
|
On Android, use non-cycle detecting locks with fairness activated (experimental)
|
diff --git a/src/_pytest/tmpdir.py b/src/_pytest/tmpdir.py
index <HASH>..<HASH> 100644
--- a/src/_pytest/tmpdir.py
+++ b/src/_pytest/tmpdir.py
@@ -158,9 +158,9 @@ class TempPathFactory:
def get_user() -> Optional[str]:
"""Return the current user name, or None if getuser() does not work
in the current environment (see #1010)."""
- import getpass
-
try:
+ # In some exotic environments, getpass may not be importable.
+ import getpass
return getpass.getuser()
except (ImportError, KeyError):
return None
|
fix: move 'import getpass' statement to try-clause
|
diff --git a/lib/fastlane/actions/hockey.rb b/lib/fastlane/actions/hockey.rb
index <HASH>..<HASH> 100644
--- a/lib/fastlane/actions/hockey.rb
+++ b/lib/fastlane/actions/hockey.rb
@@ -112,6 +112,10 @@ module Fastlane
FastlaneCore::ConfigItem.new(key: :tags,
env_name: "FL_HOCKEY_TAGS",
description: "Comma separated list of tags which will receive access to the build",
+ optional: true),
+ FastlaneCore::ConfigItem.new(key: :public_identifier,
+ env_name: "FL_HOCKEY_PUBLIC_IDENTIFIER",
+ description: "Public identifier of the app you are targeting, usually you won't need this value",
optional: true)
]
end
|
Added new public_identifier option to hockey integration
|
diff --git a/lib/cisco_node_utils/version.rb b/lib/cisco_node_utils/version.rb
index <HASH>..<HASH> 100644
--- a/lib/cisco_node_utils/version.rb
+++ b/lib/cisco_node_utils/version.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017 Cisco and/or its affiliates.
+# Copyright (c) 2015-2018 Cisco and/or its affiliates.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
# Container module for version number only.
module CiscoNodeUtils
- VERSION = '1.9.0-dev'
+ VERSION = '1.9.0'
gem_version = Gem::Version.new(Gem::VERSION)
min_gem_version = Gem::Version.new('2.1.0')
fail 'Required rubygems version >= 2.1.0' if gem_version < min_gem_version
|
Update version to be <I>
|
diff --git a/framework/base/interfaces.php b/framework/base/interfaces.php
index <HASH>..<HASH> 100644
--- a/framework/base/interfaces.php
+++ b/framework/base/interfaces.php
@@ -337,8 +337,8 @@ interface IAuthManager
{
/**
* Performs access check for the specified user.
- * @param string $itemName the name of the operation that need access check
- * @param mixed $userId the user ID. This should can be either an integer and a string representing
+ * @param string $itemName the name of the operation that we are checking access to
+ * @param mixed $userId the user ID. This should be either an integer or a string representing
* the unique identifier of a user. See {@link IWebUser::getId}.
* @param array $params name-value pairs that would be passed to biz rules associated
* with the tasks and roles assigned to the user.
|
Fixes #<I>. API doc adjustments.
|
diff --git a/sanitize_test.go b/sanitize_test.go
index <HASH>..<HASH> 100644
--- a/sanitize_test.go
+++ b/sanitize_test.go
@@ -1795,3 +1795,43 @@ func TestIssue111ScriptTags(t *testing.T) {
)
}
}
+
+func TestQuotes(t *testing.T) {
+ p := UGCPolicy()
+
+ tests := []test{
+ {
+ in: `noquotes`,
+ expected: `noquotes`,
+ },
+ {
+ in: `"singlequotes"`,
+ expected: `"singlequotes"`,
+ },
+ {
+ in: `""doublequotes""`,
+ expected: `""doublequotes""`,
+ },
+ }
+
+ // These tests are run concurrently to enable the race detector to pick up
+ // potential issues
+ wg := sync.WaitGroup{}
+ wg.Add(len(tests))
+ for ii, tt := range tests {
+ go func(ii int, tt test) {
+ out := p.Sanitize(tt.in)
+ if out != tt.expected {
+ t.Errorf(
+ "test %d failed;\ninput : %s\noutput : %s\nexpected: %s",
+ ii,
+ tt.in,
+ out,
+ tt.expected,
+ )
+ }
+ wg.Done()
+ }(ii, tt)
+ }
+ wg.Wait()
+}
|
Add test for quotes to prevent regression on the ASCII SCRIPT issue
|
diff --git a/acos_client/v30/action.py b/acos_client/v30/action.py
index <HASH>..<HASH> 100644
--- a/acos_client/v30/action.py
+++ b/acos_client/v30/action.py
@@ -20,13 +20,18 @@ from acos_client.v30 import base
class Action(base.BaseV30):
- def write_memory(self, partition="all", destination="primary", **kwargs):
+ def write_memory(self, partition="all", destination="primary", specified_partition=None, **kwargs):
payload = {
"memory": {
"destination": destination,
"partition": partition
}
}
+
+ if specified_partition:
+ del payload["memory"]["destination"]
+ payload["memory"]["specified-partition"] = specified_partition
+
try:
try:
self._post("/write/memory/", payload, **kwargs)
|
Updated acos-client to match current AXAPI write memory spec
|
diff --git a/src/de/mrapp/android/preference/activity/PreferenceHeader.java b/src/de/mrapp/android/preference/activity/PreferenceHeader.java
index <HASH>..<HASH> 100644
--- a/src/de/mrapp/android/preference/activity/PreferenceHeader.java
+++ b/src/de/mrapp/android/preference/activity/PreferenceHeader.java
@@ -441,7 +441,9 @@ public class PreferenceHeader implements Parcelable {
TextUtils.writeToParcel(getSummary(), dest, flags);
TextUtils.writeToParcel(getBreadCrumbTitle(), dest, flags);
TextUtils.writeToParcel(getBreadCrumbShortTitle(), dest, flags);
- dest.writeParcelable(((BitmapDrawable) getIcon()).getBitmap(), flags);
+ Bitmap bitmap = (getIcon() != null && getIcon() instanceof BitmapDrawable) ? ((BitmapDrawable) getIcon())
+ .getBitmap() : null;
+ dest.writeParcelable(bitmap, flags);
dest.writeString(getFragment());
dest.writeBundle(getExtras());
|
Avoided NPE when no icon is set.
|
diff --git a/admin/settings/mnet.php b/admin/settings/mnet.php
index <HASH>..<HASH> 100644
--- a/admin/settings/mnet.php
+++ b/admin/settings/mnet.php
@@ -1,5 +1,5 @@
<?php
-require_once($CFG->dirroot.'/mnet/lib.php');
+
// This file defines settingpages and externalpages under the "mnet" category
if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
|
rating MDL-<I> Removed accidental commit of an unrelated mnet work around
|
diff --git a/src/renderable/camera.js b/src/renderable/camera.js
index <HASH>..<HASH> 100644
--- a/src/renderable/camera.js
+++ b/src/renderable/camera.js
@@ -65,7 +65,6 @@
follow_axis : 0,
// shake parameters
- shaking : false,
_shake : null,
// fade parameters
_fadeIn : null,
@@ -287,10 +286,10 @@
var updated = this.updateTarget();
- if (this.shaking === true) {
+ if (this._shake.duration > 0) {
this._shake.duration -= dt;
if (this._shake.duration <= 0) {
- this.shaking = false;
+ this._shake.duration = 0;
this.offset.setZero();
if (typeof(this._shake.onComplete) === "function") {
this._shake.onComplete();
@@ -337,16 +336,14 @@
* me.game.viewport.shake(10, 500, me.game.viewport.AXIS.BOTH);
*/
shake : function(intensity, duration, axis, onComplete) {
- if (this.shaking)
+ if (this._shake.duration > 0)
return;
- this.shaking = true;
-
this._shake = {
intensity : intensity,
duration : duration,
axis : axis || this.AXIS.BOTH,
- onComplete : onComplete || null
+ onComplete : onComplete
};
},
|
Cleaned the shaking function
the `shaking` flag is useless now that we can check it using the
remaining duration
|
diff --git a/src/android/org/jboss/aerogear/cordova/push/PushPlugin.java b/src/android/org/jboss/aerogear/cordova/push/PushPlugin.java
index <HASH>..<HASH> 100644
--- a/src/android/org/jboss/aerogear/cordova/push/PushPlugin.java
+++ b/src/android/org/jboss/aerogear/cordova/push/PushPlugin.java
@@ -58,7 +58,7 @@ public class PushPlugin extends CordovaPlugin {
private static CordovaWebView webViewReference;
private static String javascriptCallback;
private static Bundle cachedExtras = null;
- private static boolean foreground = true;
+ private static boolean foreground = false;
private SharedPreferences preferences;
@@ -85,6 +85,8 @@ public class PushPlugin extends CordovaPlugin {
Log.v(TAG, "execute: action=" + action);
+ foreground = true;
+
if (REGISTER.equals(action)) {
Log.v(TAG, "execute: data=" + data.toString());
|
Fix for AGPUSH<I> - create notification when app is closed.
|
diff --git a/Eloquent/Builder.php b/Eloquent/Builder.php
index <HASH>..<HASH> 100755
--- a/Eloquent/Builder.php
+++ b/Eloquent/Builder.php
@@ -1004,7 +1004,7 @@ class Builder
$qualifiedColumn = end($segments).'.'.$column;
- $values[$qualifiedColumn] = $values[$column];
+ $values[$qualifiedColumn] = Arr::get($values, $qualifiedColumn, $values[$column]);
unset($values[$column]);
|
fix updated with provided qualified updated_at (#<I>)
|
diff --git a/lib/massa/tool.rb b/lib/massa/tool.rb
index <HASH>..<HASH> 100644
--- a/lib/massa/tool.rb
+++ b/lib/massa/tool.rb
@@ -4,7 +4,13 @@ module Massa
class Tool
class << self
def list
- YAML.load_file(config_file_from_gem).merge YAML.load_file(config_file_from_project)
+ default_tools = YAML.load_file(config_file_from_gem)
+
+ if File.exist?(config_file_from_project)
+ default_tools.merge YAML.load_file(config_file_from_project)
+ else
+ default_tools
+ end
end
def config_file_from_gem
|
Fixing 'Tool#list' method when custom config file is not present
|
diff --git a/lib/ansiblereview/__main__.py b/lib/ansiblereview/__main__.py
index <HASH>..<HASH> 100755
--- a/lib/ansiblereview/__main__.py
+++ b/lib/ansiblereview/__main__.py
@@ -94,5 +94,5 @@ def main():
info("Reviewing all of %s" % candidate, options)
errors = errors + candidate.review(options, lines)
else:
- warn("Couldn't classify file %s" % filename, options)
+ info("Couldn't classify file %s" % filename, options)
return errors
|
PR: for #<I> do not warn for not classified files (#<I>)
|
diff --git a/great_expectations/render/renderer/site_builder.py b/great_expectations/render/renderer/site_builder.py
index <HASH>..<HASH> 100644
--- a/great_expectations/render/renderer/site_builder.py
+++ b/great_expectations/render/renderer/site_builder.py
@@ -62,7 +62,7 @@ class SiteBuilder(object):
class_name: DefaultSiteIndexBuilder
# Verbose version:
- # index_builder:
+ # site_index_builder:
# module_name: great_expectations.render.builder
# class_name: DefaultSiteIndexBuilder
# renderer:
|
fix a description that may be misleading (#<I>)
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,12 +1,15 @@
$LOAD_PATH.unshift(File.dirname(__FILE__))
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support'))
require 'fileutils'
require 'mailman'
require 'rspec'
-require 'pop3_mock'
require 'maildir'
+# Require all files in spec/support (Mocks, helpers, etc.)
+Dir[File.join(File.dirname(__FILE__), "support", "**", "*.rb")].each do |f|
+ require File.expand_path(f)
+end
+
unless defined?(SPEC_ROOT)
SPEC_ROOT = File.join(File.dirname(__FILE__))
end
|
Require all files in spec/support
|
diff --git a/django_x509/base/admin.py b/django_x509/base/admin.py
index <HASH>..<HASH> 100644
--- a/django_x509/base/admin.py
+++ b/django_x509/base/admin.py
@@ -99,7 +99,8 @@ class AbstractCaAdmin(BaseAdmin):
'modified']
class Media:
- js = ('django-x509/js/x509-admin.js',)
+ js = ('admin/js/jquery.init.js',
+ 'django-x509/js/x509-admin.js',)
def get_urls(self):
return [
@@ -150,7 +151,8 @@ class AbstractCertAdmin(BaseAdmin):
actions = ['revoke_action']
class Media:
- js = ('django-x509/js/x509-admin.js',)
+ js = ('admin/js/jquery.init.js',
+ 'django-x509/js/x509-admin.js',)
def ca_url(self, obj):
url = reverse('admin:{0}_ca_change'.format(self.opts.app_label), args=[obj.ca.pk])
|
[bug] Fix JavaScript error on django <I> #<I>
This commit fixes JS error on django <I>. Changes:
- added pointer to `jquery.init.js` in admin.py `Media` classes according to django <I> release notes
Fixes #<I>
|
diff --git a/src/Util.php b/src/Util.php
index <HASH>..<HASH> 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -384,21 +384,6 @@ final class Util
if ($length < 1) {
return '';
}
-
- /**
- * @var array<int, int>
- */
- $leftInt = self::stringToIntArray($left);
-
- /**
- * @var array<int, int>
- */
- $rightInt = self::stringToIntArray($right);
-
- $output = '';
- for ($i = 0; $i < $length; ++$i) {
- $output .= self::intToChr($leftInt[$i] ^ $rightInt[$i]);
- }
- return $output;
+ return (string) ($left ^ $right);
}
}
|
XORing two strings together need not be explicitly written out.
|
diff --git a/alot/errors.py b/alot/errors.py
index <HASH>..<HASH> 100644
--- a/alot/errors.py
+++ b/alot/errors.py
@@ -3,7 +3,7 @@
# For further details see the COPYING file
-class GPGCode:
+class GPGCode(object):
AMBIGUOUS_NAME = 1
NOT_FOUND = 2
BAD_PASSPHRASE = 3
|
Turn alot.errors.GPGCode into a new style class
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -85,12 +85,13 @@ module.exports = function(grunt){
],
},
dist: {
- files: "scss/*.scss",
+ files: "flexout.scss",
tasks: ["sass", "autoprefixer", "cssmin"]
},
docs: {
files: "docs/scss/*.scss",
- tasks: ["sass:docs", "autoprefixer:docs", "cssmin:docs"]
+ // tasks: ["sass:docs", "autoprefixer:docs", "cssmin:docs"]
+ tasks: ["sass:docs", "autoprefixer:docs"]
}
}
});
|
fix sass file watcher
|
diff --git a/onnx/test/schema_test.py b/onnx/test/schema_test.py
index <HASH>..<HASH> 100644
--- a/onnx/test/schema_test.py
+++ b/onnx/test/schema_test.py
@@ -5,10 +5,10 @@ from onnx import defs, AttributeProto
class TestSchema(unittest.TestCase):
- def test_get_schema(self):
+ def test_get_schema(self): # type: () -> None
defs.get_schema("Relu")
- def test_typecheck(self):
+ def test_typecheck(self): # type: () -> None
defs.get_schema("Conv")
def test_attr_default_value(self):
|
Add type hints to schema_test.py (#<I>)
|
diff --git a/rest_framework_gis/serializers.py b/rest_framework_gis/serializers.py
index <HASH>..<HASH> 100644
--- a/rest_framework_gis/serializers.py
+++ b/rest_framework_gis/serializers.py
@@ -49,7 +49,7 @@ class GeoFeatureModelSerializer(GeoModelSerializer):
# if 'fields' are declared, make sure it includes 'geo_field'
if self.opts.fields:
if self.opts.geo_field not in self.opts.fields:
- self.opts.fields = list(self.opts.fields)
+ #self.opts.fields = list(self.opts.fields)
self.opts.fields.append(self.opts.geo_field)
|
allow for list or tuple of field names
|
diff --git a/core/model/ErrorPage.php b/core/model/ErrorPage.php
index <HASH>..<HASH> 100755
--- a/core/model/ErrorPage.php
+++ b/core/model/ErrorPage.php
@@ -58,7 +58,8 @@ class ErrorPage extends Page {
function requireDefaultRecords() {
parent::requireDefaultRecords();
- if(!DataObject::get_one('ErrorPage', "\"ErrorCode\" = '404'")) {
+ $errorPage = DataObject::get_one('ErrorPage', "\"ErrorCode\" = '404'");
+ if(!($errorPage && $errorPage->exists())) {
$errorpage = new ErrorPage();
$errorpage->ErrorCode = 404;
$errorpage->Title = _t('ErrorPage.DEFAULTERRORPAGETITLE', 'Page not found');
|
BUGFIX Ensure that before creating default <I> error page, we don't have one already that exists with a record ID (from r<I>)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@<I> <I>b<I>ca-7a2a-<I>-9d3b-<I>d<I>a<I>a9
|
diff --git a/lib/partition.js b/lib/partition.js
index <HASH>..<HASH> 100644
--- a/lib/partition.js
+++ b/lib/partition.js
@@ -23,8 +23,8 @@ Partition.prototype = {
constructor: Partition,
__OOB: function( lba ) {
- return lba <= this.firstLBA ||
- lba >= this.lastLBA
+ return lba < this.firstLBA ||
+ lba > this.lastLBA
},
get blockSize() {
|
Updated lib/partition: Fixed error in .__OOB()
Less/more than or equal should've just been less/more than.
No equal. NO EQUAL.
|
diff --git a/src/Helpers/MenuBuilder.php b/src/Helpers/MenuBuilder.php
index <HASH>..<HASH> 100644
--- a/src/Helpers/MenuBuilder.php
+++ b/src/Helpers/MenuBuilder.php
@@ -133,7 +133,7 @@ class MenuBuilder
$path = ltrim(rtrim($item['path'], '/'), '/');
// Pre-set our link in case the match() throws an exception
- $item['link'] = '/' . $path;
+ $item['link'] = $this->app['resources']->getUrl('root') . $path;
try {
// See if we have a 'content/id' or 'content/slug' path
|
Don't assume root URL is '/'
|
diff --git a/vocabs/fpad/index.js b/vocabs/fpad/index.js
index <HASH>..<HASH> 100644
--- a/vocabs/fpad/index.js
+++ b/vocabs/fpad/index.js
@@ -528,7 +528,7 @@ register('corrective_action', {
description: 'corrective_action is the corrective action details associated with '+
'a particular control point as found in the corrective actions report.',
propertySchema: enumSchema([
- 'score', 'organization_response', 'organization_comments', 'decision'
+ 'score', 'organization_response', 'organization_comments', 'decision', 'files',
]),
});
|
corrective actions should have their own files array
|
diff --git a/jspdf.js b/jspdf.js
index <HASH>..<HASH> 100644
--- a/jspdf.js
+++ b/jspdf.js
@@ -933,14 +933,17 @@ PubSub implementation
@name output
*/
output = function (type, options) {
- var undef, isThisSafari, data, length, array, i, blob;
+ var undef, data, length, array, i, blob;
switch (type) {
case undef:
return buildDocument();
case 'save':
- isThisSafari = navigator.vendor !== undefined ? navigator.vendor.split(' ')[0] : 'must be ie';
- if (window.opera !== undefined || isThisSafari === 'Apple') {
- return API.output('dataurlnewwindow');
+ if (navigator.getUserMedia || Blob.prototype.slice === undefined) {
+ if (window.URL === undefined) {
+ return API.output('dataurlnewwindow');
+ } else if (window.URL.createObjectURL === undefined) {
+ return API.output('dataurlnewwindow');
+ }
}
data = buildDocument();
|
jspdf.js :
No more asking about Safari or Opera
|
diff --git a/webapps/ui/cockpit/plugins/base/app/views/processInstance/incidentsTab.js b/webapps/ui/cockpit/plugins/base/app/views/processInstance/incidentsTab.js
index <HASH>..<HASH> 100644
--- a/webapps/ui/cockpit/plugins/base/app/views/processInstance/incidentsTab.js
+++ b/webapps/ui/cockpit/plugins/base/app/views/processInstance/incidentsTab.js
@@ -4,7 +4,6 @@ var fs = require('fs');
var angular = require('angular');
var incidentsTemplate = fs.readFileSync(__dirname + '/incidents-tab.html', 'utf8');
-var retryTemplate = fs.readFileSync(__dirname + '/job-retry-dialog.html', 'utf8');
var Configuration = function PluginConfiguration(ViewsProvider) {
ViewsProvider.registerDefaultView('cockpit.processInstance.runtime.tab', {
|
fix(incident tab): remove unused template
Related to: #CAM-<I>
|
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index <HASH>..<HASH> 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -688,6 +688,12 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string) (cfg.Config, er
// convert https_proxy to HTTPS_PROXY for linux
// TODO (@medyagh): if user has both http_proxy & HTTPS_PROXY set merge them.
k = strings.ToUpper(k)
+ if k == "HTTP_PROXY" || k == "HTTPS_PROXY" {
+ if strings.HasPrefix(v, "localhost") || strings.HasPrefix(v, "127.0") {
+ out.WarningT("Not passing {{.name}}={{.value}} to docker env.", out.V{"name": k, "value": v})
+ continue
+ }
+ }
dockerEnv = append(dockerEnv, fmt.Sprintf("%s=%s", k, v))
}
}
|
don't pass http_proxy to dockerEnv if it's poiting to localhost
|
diff --git a/lib/reqres_rspec/version.rb b/lib/reqres_rspec/version.rb
index <HASH>..<HASH> 100644
--- a/lib/reqres_rspec/version.rb
+++ b/lib/reqres_rspec/version.rb
@@ -1,3 +1,3 @@
module ReqresRspec
- VERSION = '0.0.21'
+ VERSION = '0.0.22'
end
|
upd version to <I>
|
diff --git a/app/models/renalware/ukrdc/incoming/file_list.rb b/app/models/renalware/ukrdc/incoming/file_list.rb
index <HASH>..<HASH> 100644
--- a/app/models/renalware/ukrdc/incoming/file_list.rb
+++ b/app/models/renalware/ukrdc/incoming/file_list.rb
@@ -6,7 +6,7 @@ module Renalware
module UKRDC
module Incoming
class FileList
- pattr_initialize [pattern: "*.xml", paths: Paths.new]
+ pattr_initialize [pattern: "survey*.xml", paths: Paths.new]
# Helper which yields each file in the incoming folder.
def each_file
|
Only import UKRDC xml files starting with 'survey'
|
diff --git a/src/main/java/org/hibernate/cache/infinispan/util/Caches.java b/src/main/java/org/hibernate/cache/infinispan/util/Caches.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/hibernate/cache/infinispan/util/Caches.java
+++ b/src/main/java/org/hibernate/cache/infinispan/util/Caches.java
@@ -319,6 +319,11 @@ public class Caches {
public Object next() {
return entryIterator.next().getKey();
}
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException( "remove() not supported" );
+ }
};
}
|
HHH-<I> - Fix problem with incomplete Iterator impl
|
diff --git a/state/api/serve.go b/state/api/serve.go
index <HASH>..<HASH> 100644
--- a/state/api/serve.go
+++ b/state/api/serve.go
@@ -65,7 +65,6 @@ func (srv *Server) run(lis net.Listener) {
srv.wg.Done()
}()
handler := websocket.Handler(func(conn *websocket.Conn) {
- defer conn.Close()
srv.wg.Add(1)
defer srv.wg.Done()
// If we've got to this stage and the tomb is still
@@ -102,6 +101,12 @@ type rpcResponse struct {
func (st *srvState) run() {
msgs := make(chan rpcRequest)
go st.readRequests(msgs)
+ defer func() {
+ st.conn.Close()
+ // Wait for readRequests to see the closed connection and quit.
+ for _ = range msgs {
+ }
+ }()
for {
var req rpcRequest
var ok bool
|
state/api: wait for readRequsts to quit
|
diff --git a/src/main/lombok/ast/ListAccessor.java b/src/main/lombok/ast/ListAccessor.java
index <HASH>..<HASH> 100644
--- a/src/main/lombok/ast/ListAccessor.java
+++ b/src/main/lombok/ast/ListAccessor.java
@@ -277,7 +277,7 @@ class ListAccessor<T extends Node, P extends Node> {
}
@Override public T get(int idx) {
- Node r = raw.first();
+ Node r = raw.get(idx);
if (r == null) throw new IndexOutOfBoundsException();
if (!tClass.isInstance(r)) throw new AstException(parent, String.format(
"element #%d of %s isn't of the appropriate type(%s): %s",
|
Bugfix: StrictListAccessor's get method was broken and always returned entry 0.
|
diff --git a/client/my-sites/stats/annual-site-stats/index.js b/client/my-sites/stats/annual-site-stats/index.js
index <HASH>..<HASH> 100644
--- a/client/my-sites/stats/annual-site-stats/index.js
+++ b/client/my-sites/stats/annual-site-stats/index.js
@@ -188,7 +188,7 @@ class AnnualSiteStats extends Component {
{ isWidget && currentYearData && this.renderWidgetContent( currentYearData, strings ) }
{ isWidget && previousYearData && this.renderWidgetContent( previousYearData, strings ) }
{ ! isWidget && years && this.renderTable( years, strings ) }
- { isWidget && years && years.length && (
+ { isWidget && years && years.length !== 0 && (
<div className="module-expand">
<a href={ viewAllLink }>
{ translate( 'View All', { context: 'Stats: Button label to expand a panel' } ) }
|
Fix for errant "0" character when viewing a site with no annual stats. (#<I>)
|
diff --git a/src/components/SingleValue.js b/src/components/SingleValue.js
index <HASH>..<HASH> 100644
--- a/src/components/SingleValue.js
+++ b/src/components/SingleValue.js
@@ -23,7 +23,7 @@ export const css = ({ isDisabled }: State) => ({
color: isDisabled ? colors.neutral40 : colors.text,
marginLeft: spacing.baseUnit / 2,
marginRight: spacing.baseUnit / 2,
- maxWidth: '100%',
+ maxWidth: `calc(100% - ${spacing.baseUnit * 2}px)`,
overflow: 'hidden',
position: 'absolute',
textOverflow: 'ellipsis',
diff --git a/src/components/containers.js b/src/components/containers.js
index <HASH>..<HASH> 100644
--- a/src/components/containers.js
+++ b/src/components/containers.js
@@ -64,6 +64,7 @@ export const valueContainerCSS = ({ maxHeight }: ValueContainerProps) => ({
overflowY: 'auto',
padding: `${spacing.baseUnit / 2}px ${spacing.baseUnit * 2}px`,
WebkitOverflowScrolling: 'touch',
+ position: 'relative',
});
export class ValueContainer extends Component<ValueContainerProps> {
shouldScrollBottom: boolean = false;
|
fix for overflowing long values in SingleValue and ValueContainer
|
diff --git a/package-scripts.js b/package-scripts.js
index <HASH>..<HASH> 100644
--- a/package-scripts.js
+++ b/package-scripts.js
@@ -1,8 +1,8 @@
-/* eslint prefer-template:"off" */ // this file runs in node 0.10.0
-const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1])
-const validate = ['lint', 'build', 'cover']
+/* eslint prefer-template:"off", no-var:"off" */ // this file runs in node 0.10.0
+var nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1])
+var validate = ['lint', 'build', 'cover']
if (nodeVersion < 4) {
- validate.slice(1)
+ validate = validate.slice(1)
}
module.exports = {
scripts: {
|
fix(scripts): validate needs reassignment
|
diff --git a/lib/active_scaffold/actions/core.rb b/lib/active_scaffold/actions/core.rb
index <HASH>..<HASH> 100644
--- a/lib/active_scaffold/actions/core.rb
+++ b/lib/active_scaffold/actions/core.rb
@@ -2,6 +2,7 @@ module ActiveScaffold::Actions
module Core
def self.included(base)
base.class_eval do
+ before_action :set_vary_accept_header
before_action :handle_user_settings
before_action :check_input_device
before_action :register_constraints_with_action_columns, :unless => :nested?
@@ -292,6 +293,10 @@ module ActiveScaffold::Actions
session.delete(session_index) if session[session_index].blank?
end
+ def set_vary_accept_header
+ response.headers['Vary'] = 'Accept'
+ end
+
# at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
def handle_user_settings
storage = active_scaffold_config.store_user_settings ? active_scaffold_session_storage : {}
|
avoid browser mixes html and xhr cache for listing requests, using vary header
|
diff --git a/config/__init__.py b/config/__init__.py
index <HASH>..<HASH> 100644
--- a/config/__init__.py
+++ b/config/__init__.py
@@ -12,7 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import os
from .config_exception import ConfigException
from .incluster_config import load_incluster_config
from .kube_config import (list_kube_config_contexts, load_kube_config,
- load_kube_config_from_dict, new_client_from_config)
+ load_kube_config_from_dict, new_client_from_config, KUBE_CONFIG_DEFAULT_LOCATION)
+
+
+def load_config(**kwargs):
+ """
+ Wrapper function to load the kube_config.
+ It will initially try to load_kube_config from provided path, then check if the KUBE_CONFIG_DEFAULT_LOCATION exists
+ If neither exists- it will fall back to load_incluster_config and inform the user accordingly.
+ """
+ if "kube_config_path" in kwargs.keys() or os.path.exists(KUBE_CONFIG_DEFAULT_LOCATION):
+ load_kube_config(**kwargs)
+ else:
+ print(f"kube_config_path not provided and default location ({KUBE_CONFIG_DEFAULT_LOCATION}) does not exist. "
+ "Using inCluster Config. This might not work.")
+ load_incluster_config(**kwargs)
|
Adding load_config wrapper method to have a more generic way of initializing the client config
|
diff --git a/src/Console/UseCommand.php b/src/Console/UseCommand.php
index <HASH>..<HASH> 100644
--- a/src/Console/UseCommand.php
+++ b/src/Console/UseCommand.php
@@ -11,11 +11,13 @@ class UseCommand extends Command
private $elixirFiles = [
'gulpfile.js',
'package.json',
+ 'package-lock.json',
'tasks/bin.js',
];
private $mixFiles = [
'webpack.mix.js',
'package.json',
+ 'package-lock.json',
'tasks/bin.js',
];
|
Remove package-lock.json when switching build tools
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -55,7 +55,7 @@ function getTarget (abi, runtime) {
.map(function (t) {
return t.target
})
- if (match) return match[0]
+ if (match.length) return match[0]
throw new Error('Could not detect target for abi ' + abi + ' and runtime ' + runtime)
}
diff --git a/test/index.js b/test/index.js
index <HASH>..<HASH> 100644
--- a/test/index.js
+++ b/test/index.js
@@ -15,6 +15,7 @@ test('getTarget calculates correct Node target', function (t) {
})
test('getTarget calculates correct Electron target', function (t) {
+ t.throws(getTarget.bind(null, '14', 'electron'))
t.equal(getTarget('47', 'electron'), '1.0.2')
t.equal(getTarget('48', 'electron'), '1.2.8')
t.equal(getTarget('49', 'electron'), '1.3.13')
|
fix case where there is no electron match
|
diff --git a/examples/ROOT/inspect_tree.py b/examples/ROOT/inspect_tree.py
index <HASH>..<HASH> 100755
--- a/examples/ROOT/inspect_tree.py
+++ b/examples/ROOT/inspect_tree.py
@@ -42,7 +42,7 @@ for leaf in tree.GetListOfLeaves():
row = [ ]
row.append(leaf.GetName())
row.append(leaf.GetTypeName())
- row.append(typedic[leaf.GetTypeName()])
+ row.append(typedic[leaf.GetTypeName()] if leaf.GetTypeName() in typedic else "unknown")
row.append('yes ' if isArray else 'no')
row.append(leafcount.GetName() if isArray else None)
row.append(leafcount.GetTypeName() if isArray else None)
|
update examples/ROOT/inspect_tree.py
|
diff --git a/lib/walker.js b/lib/walker.js
index <HASH>..<HASH> 100644
--- a/lib/walker.js
+++ b/lib/walker.js
@@ -857,7 +857,6 @@
this.atomize = atomize;
this.ignore.push(atomize);
}
- this.ignore.push('this');
}
ProxyInjector.prototype = {
|
It is not correct to always ignore 'this' in a txn - the txn function could have been bound to non-global 'this' and thus 'this' can be useful.
|
diff --git a/lib/plugins/tar.js b/lib/plugins/tar.js
index <HASH>..<HASH> 100644
--- a/lib/plugins/tar.js
+++ b/lib/plugins/tar.js
@@ -76,7 +76,11 @@ Tar.prototype.finalize = function() {
};
Tar.prototype.on = function() {
- return this.engine.on.apply(this.engine, arguments);
+ if (this.compressor) {
+ return this.compressor.on.apply(this.compressor, arguments);
+ } else {
+ return this.engine.on.apply(this.engine, arguments);
+ }
};
Tar.prototype.pipe = function(destination, options) {
|
tar: when using compressor, make sure event listener gets hooked to the proper stream.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.